diff --git a/.github/workflows/dotnet-nuget.yml b/.github/workflows/dotnet-nuget.yml
index 56015394..ad9ebf39 100644
--- a/.github/workflows/dotnet-nuget.yml
+++ b/.github/workflows/dotnet-nuget.yml
@@ -29,9 +29,10 @@ jobs:
         $updatedCsprojContent = $settingsContent -replace '<Version>.*?</Version>', "<Version>${{ env.VERSION }}</Version>"
         Set-Content -Path ${{ env.COMMON_SETTINGS_PATH }} -Value $updatedCsprojContent
 
-    - name: Create .sarif Directory
-      run: New-Item -ItemType Directory -Force -Path D:\.sarif
-      shell: pwsh           
+    # Not needed as Directory.Build.props added a condition to this target
+    # - name: Create .sarif Directory
+    #   run: New-Item -ItemType Directory -Force -Path D:\.sarif
+    #   shell: pwsh
 
     # Stride.CommunityToolkit
     - name: Restore dependencies - Stride.CommunityToolkit
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index 1326658c..df5f4431 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -21,9 +21,10 @@ jobs:
       with:
         dotnet-version: 8.0.x
 
-    - name: Create .sarif Directory
-      run: New-Item -ItemType Directory -Force -Path D:\.sarif
-      shell: pwsh        
+    # Not needed as Directory.Build.props added a condition to this target
+    # - name: Create .sarif Directory
+    #   run: New-Item -ItemType Directory -Force -Path D:\.sarif
+    #   shell: pwsh
 
     # Stride.CommunityToolkit
     - name: Restore Stride.CommunityToolkit dependencies
diff --git a/Directory.Build.props b/Directory.Build.props
index c73c56ea..c2a34495 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,5 +1,5 @@
 <Project>
-  <PropertyGroup>
+  <PropertyGroup Condition="'$(SolutionDir)' != ''">
     <ErrorLog>$(SolutionDir)\.sarif\$(MSBuildProjectName).json</ErrorLog>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/CommonSettings.props b/src/CommonSettings.props
index 97a9f24a..8108b346 100644
--- a/src/CommonSettings.props
+++ b/src/CommonSettings.props
@@ -12,8 +12,6 @@
         <PackageIcon>nuget-icon.png</PackageIcon>
         <Copyright>Stride Contributors</Copyright>
         <PackageReadmeFile>README.md</PackageReadmeFile>
-        <!-- Once the issue with deployment is resolved, this can be removed -->
-        <!--<GeneratePackageOnBuild>True</GeneratePackageOnBuild>-->
     </PropertyGroup>
 
     <ItemGroup>