diff --git a/src/Dataverse/MSBuildTasks/Props/Settings.props b/src/Dataverse/MSBuildTasks/Props/Settings.props
new file mode 100644
index 0000000..a4b1797
--- /dev/null
+++ b/src/Dataverse/MSBuildTasks/Props/Settings.props
@@ -0,0 +1,5 @@
+<Project>
+    <PropertyGroup>
+        <ApplyVersionNumberToSource Condition="'$(ApplyVersionNumberToSource)' == ''">false</ApplyVersionNumberToSource>
+    </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Dataverse/MSBuildTasks/Props/SolutionFileItems.props b/src/Dataverse/MSBuildTasks/Props/SolutionFileItems.props
index 39f6182..0ab61c0 100644
--- a/src/Dataverse/MSBuildTasks/Props/SolutionFileItems.props
+++ b/src/Dataverse/MSBuildTasks/Props/SolutionFileItems.props
@@ -26,4 +26,10 @@
         <EnvironmentVariables Include="$(DataverseSolutionSourceFolderFullPath)\environmentvariabledefinitions\**\environmentvariabledefinition.xml"/>
         <ResxFiles Include="$(DataverseSolutionSourceFolderFullPath)\Resources\**\*.resx"/>
     </ItemGroup>
+    <ItemGroup>
+        <SolutionXmlIntermediateOutputPath Include="$(SolutionPackagerMetadataWorkingDirectory)\Other\Solution.xml"/>
+        <PluginAssemblyMetadataFilesIntermediateOutputPath Include="$(SolutionPackagerMetadataWorkingDirectory)\PluginAssemblies\**\*.dll.data.xml"/>
+        <WorkflowMetadataIntermediateOutputPath Include="$(SolutionPackagerMetadataWorkingDirectory)\Workflows\**\*.xaml"/>
+        <SdkMessageProcessingStepsIntermediateOutputPath Include="$(SolutionPackagerMetadataWorkingDirectory)\SdkMessageProcessingSteps\*.xml"/>
+    </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Dataverse/MSBuildTasks/TALXIS.DevKit.Build.Dataverse.Tasks.targets b/src/Dataverse/MSBuildTasks/TALXIS.DevKit.Build.Dataverse.Tasks.targets
index fa932e9..5241cdc 100644
--- a/src/Dataverse/MSBuildTasks/TALXIS.DevKit.Build.Dataverse.Tasks.targets
+++ b/src/Dataverse/MSBuildTasks/TALXIS.DevKit.Build.Dataverse.Tasks.targets
@@ -4,6 +4,7 @@
   </PropertyGroup>
   <Import Project="..\..\props\ProjectPaths.props" />
   <Import Project="..\..\props\SolutionFileItems.props" />
+  <Import Project="..\..\props\Settings.props" />
   <Import Project=".\$(MSBuildThisFileName).tasks" />
   <Import Project="..\..\targets\*.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/Dataverse/MSBuildTasks/Targets/ApplyVersionNumber.targets b/src/Dataverse/MSBuildTasks/Targets/ApplyVersionNumber.targets
index 1715df5..074b79f 100644
--- a/src/Dataverse/MSBuildTasks/Targets/ApplyVersionNumber.targets
+++ b/src/Dataverse/MSBuildTasks/Targets/ApplyVersionNumber.targets
@@ -1,6 +1,7 @@
 <Project>
     <Target Name="ApplyVersionNumber">
         <Message Text="Updating version to $(Version) in all references..." Importance="high" />
-        <ApplyVersionNumber Version="$(Version)" SolutionXml="%(SolutionXml.FullPath)" PluginAssemblies="@(PluginAssemblies)" Workflows="@(WorkflowMetadata)" SdkMessageProcessingSteps="@(SdkMessageProcessingSteps)" CustomControlsFolder="$(SolutionPackagerMetadataWorkingDirectory)" />
+        <ApplyVersionNumber Version="$(Version)" SolutionXml="%(SolutionXmlIntermediateOutputPath.FullPath)" PluginAssemblies="@(PluginAssemblyMetadataFilesIntermediateOutputPath)" Workflows="@(WorkflowMetadataIntermediateOutputPath)" SdkMessageProcessingSteps="@(SdkMessageProcessingStepsIntermediateOutputPath)" CustomControlsFolder="$(SolutionPackagerMetadataWorkingDirectory)" />
+        <ApplyVersionNumber Condition="'$(ApplyVersionNumberToSource)' == 'true'" Version="$(Version)" SolutionXml="%(SolutionXml.FullPath)" PluginAssemblies="@(PluginAssemblyMetadataFiles)" Workflows="@(WorkflowMetadata)" SdkMessageProcessingSteps="@(SdkMessageProcessingSteps)" />
     </Target>
 </Project>
\ No newline at end of file