diff --git a/.circleci/config.yml b/.circleci/config.yml
index cc3878ed61..f8c2b13bb6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -41,6 +41,7 @@ jobs:
                   (Core|Objects|ConnectorMicroStation|.*/ConverterMicroStation)/.* microstation true
                   (Core|Objects|ConnectorTeklaStructures|.*/ConverterTeklaStructures)/.* teklastructures true
                   (Core|Objects|ConnectorArchicad)/.* archicad true
+                  (Core|Objects|ConnectorNavisworks|.*/ConverterNavisworks)/.* navisworks true
                 base-revision: main
                 output-path: .circleci/scripts/parameters.json
       - run: cat .circleci/scripts/parameters.json
diff --git a/.circleci/scripts/connector-jobs.yml b/.circleci/scripts/connector-jobs.yml
index 7742ef50c3..fffcacfea9 100644
--- a/.circleci/scripts/connector-jobs.yml
+++ b/.circleci/scripts/connector-jobs.yml
@@ -179,4 +179,12 @@ archicad:
       projname: ConnectorArchicad
       slug: archicad
       build-with-mono: false
-      installername: SpeckleArchicadInstall
\ No newline at end of file
+      installername: SpeckleArchicadInstall
+
+navisworks:
+  - build-connector:
+      slnname: ConnectorNavisworks
+      dllname: SpeckleConnectorNavisworks.dll
+      slug: navisworks
+      requires:
+        - build-desktopui
\ No newline at end of file
diff --git a/.circleci/scripts/parameters.json b/.circleci/scripts/parameters.json
index 757527a037..6403bd9513 100644
--- a/.circleci/scripts/parameters.json
+++ b/.circleci/scripts/parameters.json
@@ -7,5 +7,6 @@
   "autocadcivil": true,
   "microstation": true,
   "archicad": true,
-  "teklastructures": true
+  "teklastructures": true,
+  "navisworks": true
 }
diff --git a/ConnectorNavisworks/ConnectorNavisworks2020/ConnectorNavisworks2020.csproj b/ConnectorNavisworks/ConnectorNavisworks2020/ConnectorNavisworks2020.csproj
index 68eccb4644..70bcfe0229 100644
--- a/ConnectorNavisworks/ConnectorNavisworks2020/ConnectorNavisworks2020.csproj
+++ b/ConnectorNavisworks/ConnectorNavisworks2020/ConnectorNavisworks2020.csproj
@@ -31,9 +31,9 @@
 		<Configurations>Debug;Release</Configurations>
 
 		<NavisworksBuildNumber>v17</NavisworksBuildNumber>
-		<NavisworksApiPath>C:\Program Files\Autodesk\Navisworks Manage 2020</NavisworksApiPath>
-	
+		<NavisworksVersion>2020</NavisworksVersion>
 		<PluginBundleTarget>$(AppData)\Autodesk\ApplicationPlugins\Speckle.ConnectorNavisworks.bundle</PluginBundleTarget>
+		<PluginVersionContentTarget>$(AppData)\Autodesk\ApplicationPlugins\Speckle.ConnectorNavisworks.bundle\Contents\$(NavisworksBuildNumber)</PluginVersionContentTarget>
 		<Platforms>AnyCPU;x64</Platforms>
 	</PropertyGroup>
 
@@ -63,42 +63,6 @@
 	<!-- Includes -->
 	<Import Project="..\ConnectorNavisworks\ConnectorNavisworks.Shared.projitems" Label="Shared" />
 
-	<!-- Post Builds -->
-	<PropertyGroup>
-		<PostBuildEvent>
-			@echo off
-			echo Check for existing bundle build
-			IF EXIST "$(PluginBundleTarget)\Contents\$(NavisworksBuildNumber)" (
-			echo $(PluginBundleTarget)\Contents\$(NavisworksBuildNumber)\ exists
-			echo Remove Existing Bundle Build
-			rmdir /S /Q "$(PluginBundleTarget)\Contents\$(NavisworksBuildNumber)"
-			)
-
-			echo(
-			echo Write Plugin DLL
-			xcopy /Y "$(TargetPath)" "$(PluginBundleTarget)\Contents\$(NavisworksBuildNumber)\"
-
-			echo(
-			echo Package Content File
-			xcopy /Y "$(TargetDir)Entry\PackageContents.xml" "$(PluginBundleTarget)\"
-
-			echo(
-			echo Copy UI Resources
-			mkdir "$(PluginBundleTarget)\Contents\$(NavisworksBuildNumber)\en-US
-			copy /Y "$(TargetDir)Entry\Ribbon.xaml" "$(PluginBundleTarget)\Contents\$(NavisworksBuildNumber)\en-US\"
-			copy /Y "$(TargetDir)Entry\Ribbon.name" "$(PluginBundleTarget)\Contents\$(NavisworksBuildNumber)\en-US\"
-
-			echo(
-			echo Copy Resources
-			mkdir "$(PluginBundleTarget)\Contents\$(NavisworksBuildNumber)\Resources
-			copy /Y "$(TargetDir)Resources\*.*" "$(PluginBundleTarget)\Contents\$(NavisworksBuildNumber)\Resources\"
-
-			echo(
-			echo Copy Dependencies
-			xcopy /Y "$(TargetDir)*.dll" "$(PluginBundleTarget)\Contents\$(NavisworksBuildNumber)\"
-		</PostBuildEvent>
-	</PropertyGroup>
-
 	<!-- NUGETS -->
 	<ItemGroup>
 	  <PackageReference Include="Speckle.Navisworks.API" Version="2020.0.0" />
@@ -176,4 +140,19 @@
 			<Private>False</Private>
 		</Reference>
 	</ItemGroup>
+
+	<!-- Post Builds -->
+	<PropertyGroup>
+		<PostBuildEvent Condition=" '$(Configuration)' == 'Debug' ">
+			if exist "$(PluginVersionContentTarget)" ( rmdir /S /Q "$(PluginVersionContentTarget)" )
+			xcopy /y "$(TargetDir)Entry\PackageContents.xml" "$(PluginBundleTarget)\"
+			xcopy /y "$(TargetDir)Entry\Ribbon.*" "$(PluginVersionContentTarget)\en-US\"
+			xcopy /e /i /y "$(TargetDir)*.*" "$(PluginVersionContentTarget)\"
+		</PostBuildEvent>
+
+		<PostBuildEvent Condition=" '$(Configuration)' == 'Release' ">
+			echo RELEASE copy from $(TargetDir) to $(SolutionDir)Release\Release\$(NavisworksVersion)\"
+			xcopy /e /i /y "$(TargetDir)*.*" "$(SolutionDir)Release\Release$(NavisworksVersion)\"
+		</PostBuildEvent>
+	</PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/ConnectorNavisworks/ConnectorNavisworks2021/ConnectorNavisworks2021.csproj b/ConnectorNavisworks/ConnectorNavisworks2021/ConnectorNavisworks2021.csproj
index 0e52419eff..662793c26d 100644
--- a/ConnectorNavisworks/ConnectorNavisworks2021/ConnectorNavisworks2021.csproj
+++ b/ConnectorNavisworks/ConnectorNavisworks2021/ConnectorNavisworks2021.csproj
@@ -31,8 +31,9 @@
 		<Configurations>Debug;Release</Configurations>
 
 		<NavisworksBuildNumber>v18</NavisworksBuildNumber>
-		<NavisworksApiPath>C:\Program Files\Autodesk\Navisworks Manage 2021</NavisworksApiPath>
+		<NavisworksVersion>2021</NavisworksVersion>
 		<PluginBundleTarget>$(AppData)\Autodesk\ApplicationPlugins\Speckle.ConnectorNavisworks.bundle</PluginBundleTarget>
+		<PluginVersionContentTarget>$(AppData)\Autodesk\ApplicationPlugins\Speckle.ConnectorNavisworks.bundle\Contents\$(NavisworksBuildNumber)</PluginVersionContentTarget>
 		<Platforms>AnyCPU;x64</Platforms>
 	</PropertyGroup>
 
@@ -62,42 +63,6 @@
 	<!-- Includes -->
 	<Import Project="..\ConnectorNavisworks\ConnectorNavisworks.Shared.projitems" Label="Shared" />
 
-	<!-- Post Builds -->
-	<PropertyGroup>
-		<PostBuildEvent>
-			@echo off
-			echo Check for existing bundle build
-			IF EXIST "$(PluginBundleTarget)\Contents\$(NavisworksBuildNumber)" (
-			echo $(PluginBundleTarget)\Contents\$(NavisworksBuildNumber)\ exists
-			echo Remove Existing Bundle Build
-			rmdir /S /Q "$(PluginBundleTarget)\Contents\$(NavisworksBuildNumber)"
-			)
-
-			echo(
-			echo Write Plugin DLL
-			xcopy /Y "$(TargetPath)" "$(PluginBundleTarget)\Contents\$(NavisworksBuildNumber)\"
-
-			echo(
-			echo Package Content File
-			xcopy /Y "$(TargetDir)Entry\PackageContents.xml" "$(PluginBundleTarget)\"
-
-			echo(
-			echo Copy UI Resources
-			mkdir "$(PluginBundleTarget)\Contents\$(NavisworksBuildNumber)\en-US
-			copy /Y "$(TargetDir)Entry\Ribbon.xaml" "$(PluginBundleTarget)\Contents\$(NavisworksBuildNumber)\en-US\"
-			copy /Y "$(TargetDir)Entry\Ribbon.name" "$(PluginBundleTarget)\Contents\$(NavisworksBuildNumber)\en-US\"
-
-			echo(
-			echo Copy Resources
-			mkdir "$(PluginBundleTarget)\Contents\$(NavisworksBuildNumber)\Resources
-			copy /Y "$(TargetDir)Resources\*.*" "$(PluginBundleTarget)\Contents\$(NavisworksBuildNumber)\Resources\"
-
-			echo(
-			echo Copy Dependencies
-			xcopy /Y "$(TargetDir)*.dll" "$(PluginBundleTarget)\Contents\$(NavisworksBuildNumber)\"
-		</PostBuildEvent>
-	</PropertyGroup>
-
 	<!-- NUGETS -->
 	<ItemGroup>
 	  <PackageReference Include="Speckle.Navisworks.API" Version="2021.0.0" />
@@ -176,4 +141,19 @@
 			<Private>False</Private>
 		</Reference>
 	</ItemGroup>
+
+	<!-- Post Builds -->
+	<PropertyGroup>
+		<PostBuildEvent Condition=" '$(Configuration)' == 'Debug' ">
+			if exist "$(PluginVersionContentTarget)" ( rmdir /S /Q "$(PluginVersionContentTarget)" )
+			xcopy /y "$(TargetDir)Entry\PackageContents.xml" "$(PluginBundleTarget)\"
+			xcopy /y "$(TargetDir)Entry\Ribbon.*" "$(PluginVersionContentTarget)\en-US\"
+			xcopy /e /i /y "$(TargetDir)*.*" "$(PluginVersionContentTarget)\"
+		</PostBuildEvent>
+
+		<PostBuildEvent Condition=" '$(Configuration)' == 'Release' ">
+			echo RELEASE copy from $(TargetDir) to $(SolutionDir)Release\Release\$(NavisworksVersion)\"
+			xcopy /e /i /y "$(TargetDir)*.*" "$(SolutionDir)Release\Release$(NavisworksVersion)\"
+		</PostBuildEvent>
+	</PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/ConnectorNavisworks/ConnectorNavisworks2022/ConnectorNavisworks2022.csproj b/ConnectorNavisworks/ConnectorNavisworks2022/ConnectorNavisworks2022.csproj
index b486ad35f1..f022c3cd8e 100644
--- a/ConnectorNavisworks/ConnectorNavisworks2022/ConnectorNavisworks2022.csproj
+++ b/ConnectorNavisworks/ConnectorNavisworks2022/ConnectorNavisworks2022.csproj
@@ -31,8 +31,9 @@
 		<Configurations>Debug;Release</Configurations>
 
 		<NavisworksBuildNumber>v19</NavisworksBuildNumber>
-		<NavisworksApiPath>C:\Program Files\Autodesk\Navisworks Manage 2022</NavisworksApiPath>
+		<NavisworksVersion>2022</NavisworksVersion>
 		<PluginBundleTarget>$(AppData)\Autodesk\ApplicationPlugins\Speckle.ConnectorNavisworks.bundle</PluginBundleTarget>
+		<PluginVersionContentTarget>$(AppData)\Autodesk\ApplicationPlugins\Speckle.ConnectorNavisworks.bundle\Contents\$(NavisworksBuildNumber)</PluginVersionContentTarget>
 		<Platforms>AnyCPU;x64</Platforms>
 	</PropertyGroup>
 
@@ -62,42 +63,6 @@
 	<!-- Includes -->
 	<Import Project="..\ConnectorNavisworks\ConnectorNavisworks.Shared.projitems" Label="Shared" />
 
-	<!-- Post Builds -->
-	<PropertyGroup>
-		<PostBuildEvent>
-			@echo off
-			echo Check for existing bundle build
-			IF EXIST "$(PluginBundleTarget)\Contents\$(NavisworksBuildNumber)" (
-			echo $(PluginBundleTarget)\Contents\$(NavisworksBuildNumber)\ exists
-			echo Remove Existing Bundle Build
-			rmdir /S /Q "$(PluginBundleTarget)\Contents\$(NavisworksBuildNumber)"
-			)
-
-			echo(
-			echo Write Plugin DLL
-			xcopy /Y "$(TargetPath)" "$(PluginBundleTarget)\Contents\$(NavisworksBuildNumber)\"
-
-			echo(
-			echo Package Content File
-			xcopy /Y "$(TargetDir)Entry\PackageContents.xml" "$(PluginBundleTarget)\"
-
-			echo(
-			echo Copy UI Resources
-			mkdir "$(PluginBundleTarget)\Contents\$(NavisworksBuildNumber)\en-US
-			copy /Y "$(TargetDir)Entry\Ribbon.xaml" "$(PluginBundleTarget)\Contents\$(NavisworksBuildNumber)\en-US\"
-			copy /Y "$(TargetDir)Entry\Ribbon.name" "$(PluginBundleTarget)\Contents\$(NavisworksBuildNumber)\en-US\"
-
-			echo(
-			echo Copy Resources
-			mkdir "$(PluginBundleTarget)\Contents\$(NavisworksBuildNumber)\Resources
-			copy /Y "$(TargetDir)Resources\*.*" "$(PluginBundleTarget)\Contents\$(NavisworksBuildNumber)\Resources\"
-
-			echo(
-			echo Copy Dependencies
-			xcopy /Y "$(TargetDir)*.dll" "$(PluginBundleTarget)\Contents\$(NavisworksBuildNumber)\"
-		</PostBuildEvent>
-	</PropertyGroup>
-
 	<!-- NUGETS -->
 	<ItemGroup>
 	  <PackageReference Include="Speckle.Navisworks.API" Version="2022.0.0" />
@@ -175,4 +140,19 @@
 			<Private>False</Private>
 		</Reference>
 	</ItemGroup>
+
+	<!-- Post Builds -->
+	<PropertyGroup>
+		<PostBuildEvent Condition=" '$(Configuration)' == 'Debug' ">
+			if exist "$(PluginVersionContentTarget)" ( rmdir /S /Q "$(PluginVersionContentTarget)" )
+			xcopy /y "$(TargetDir)Entry\PackageContents.xml" "$(PluginBundleTarget)\"
+			xcopy /y "$(TargetDir)Entry\Ribbon.*" "$(PluginVersionContentTarget)\en-US\"
+			xcopy /e /i /y "$(TargetDir)*.*" "$(PluginVersionContentTarget)\"
+		</PostBuildEvent>
+
+		<PostBuildEvent Condition=" '$(Configuration)' == 'Release' ">
+			echo RELEASE copy from $(TargetDir) to $(SolutionDir)Release\Release\$(NavisworksVersion)\"
+			xcopy /e /i /y "$(TargetDir)*.*" "$(SolutionDir)Release\Release$(NavisworksVersion)\"
+		</PostBuildEvent>
+	</PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/ConnectorNavisworks/ConnectorNavisworks2023/ConnectorNavisworks2023.csproj b/ConnectorNavisworks/ConnectorNavisworks2023/ConnectorNavisworks2023.csproj
index b8cb44556c..7dc8ea7d3d 100644
--- a/ConnectorNavisworks/ConnectorNavisworks2023/ConnectorNavisworks2023.csproj
+++ b/ConnectorNavisworks/ConnectorNavisworks2023/ConnectorNavisworks2023.csproj
@@ -31,8 +31,9 @@
 		<Configurations>Debug;Release</Configurations>
 
 		<NavisworksBuildNumber>v20</NavisworksBuildNumber>
-		<NavisworksApiPath>C:\Program Files\Autodesk\Navisworks Manage 2023</NavisworksApiPath>
+		<NavisworksVersion>2023</NavisworksVersion>
 		<PluginBundleTarget>$(AppData)\Autodesk\ApplicationPlugins\Speckle.ConnectorNavisworks.bundle</PluginBundleTarget>
+		<PluginVersionContentTarget>$(AppData)\Autodesk\ApplicationPlugins\Speckle.ConnectorNavisworks.bundle\Contents\$(NavisworksBuildNumber)</PluginVersionContentTarget>
 		<Platforms>AnyCPU;x64</Platforms>
 	</PropertyGroup>
 
@@ -62,42 +63,6 @@
 	<!-- Includes -->
 	<Import Project="..\ConnectorNavisworks\ConnectorNavisworks.Shared.projitems" Label="Shared" />
 
-	<!-- Post Builds -->
-	<PropertyGroup>
-		<PostBuildEvent>
-			@echo off
-			echo Check for existing bundle build
-			IF EXIST "$(PluginBundleTarget)\Contents\$(NavisworksBuildNumber)" (
-			echo $(PluginBundleTarget)\Contents\$(NavisworksBuildNumber)\ exists
-			echo Remove Existing Bundle Build
-			rmdir /S /Q "$(PluginBundleTarget)\Contents\$(NavisworksBuildNumber)"
-			)
-
-			echo(
-			echo Write Plugin DLL
-			xcopy /Y "$(TargetPath)" "$(PluginBundleTarget)\Contents\$(NavisworksBuildNumber)\"
-
-			echo(
-			echo Package Content File
-			xcopy /Y "$(TargetDir)Entry\PackageContents.xml" "$(PluginBundleTarget)\"
-
-			echo(
-			echo Copy UI Resources
-			mkdir "$(PluginBundleTarget)\Contents\$(NavisworksBuildNumber)\en-US
-			copy /Y "$(TargetDir)Entry\Ribbon.xaml" "$(PluginBundleTarget)\Contents\$(NavisworksBuildNumber)\en-US\"
-			copy /Y "$(TargetDir)Entry\Ribbon.name" "$(PluginBundleTarget)\Contents\$(NavisworksBuildNumber)\en-US\"
-
-			echo(
-			echo Copy Resources
-			mkdir "$(PluginBundleTarget)\Contents\$(NavisworksBuildNumber)\Resources
-			copy /Y "$(TargetDir)Resources\*.*" "$(PluginBundleTarget)\Contents\$(NavisworksBuildNumber)\Resources\"
-
-			echo(
-			echo Copy Dependencies
-			xcopy /Y "$(TargetDir)*.dll" "$(PluginBundleTarget)\Contents\$(NavisworksBuildNumber)\"
-		</PostBuildEvent>
-	</PropertyGroup>
-
 	<!-- NUGETS -->
 	<ItemGroup>
 	  <PackageReference Include="Speckle.Navisworks.API" Version="2023.0.0" />
@@ -110,6 +75,7 @@
 		<ProjectReference Include="..\..\DesktopUI2\AvaloniaHwndHost\AvaloniaHwndHost.csproj" />
 	</ItemGroup>
 
+
 	<!-- References -->
 	<ItemGroup>
 		<Reference Include="System.ComponentModel.Composition">
@@ -175,4 +141,19 @@
 			<Private>False</Private>
 		</Reference>
 	</ItemGroup>
+
+	<!-- Post Builds -->
+	<PropertyGroup>
+		<PostBuildEvent Condition=" '$(Configuration)' == 'Debug' ">
+			if exist "$(PluginVersionContentTarget)" ( rmdir /S /Q "$(PluginVersionContentTarget)" )
+			xcopy /y "$(TargetDir)Entry\PackageContents.xml" "$(PluginBundleTarget)\"
+			xcopy /y "$(TargetDir)Entry\Ribbon.*" "$(PluginVersionContentTarget)\en-US\"
+			xcopy /e /i /y "$(TargetDir)*.*" "$(PluginVersionContentTarget)\"
+		</PostBuildEvent>
+
+		<PostBuildEvent Condition=" '$(Configuration)' == 'Release' ">
+			echo RELEASE copy from $(TargetDir) to $(SolutionDir)Release\Release\$(NavisworksVersion)\"
+			xcopy /e /i /y "$(TargetDir)*.*" "$(SolutionDir)Release\Release$(NavisworksVersion)\"
+		</PostBuildEvent>
+	</PropertyGroup>
 </Project>
\ No newline at end of file