diff --git a/Engine/Engine.csproj b/Engine/Engine.csproj
index a7ea835ec..fac7cbbae 100644
--- a/Engine/Engine.csproj
+++ b/Engine/Engine.csproj
@@ -28,6 +28,20 @@
   <Compile Remove="Commands\GetScriptAnalyzerLoggerCommand.cs" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Remove="Settings\*.psd1" />
+    <None Remove="Settings\*.json" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="Settings\*.psd1">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Settings\*.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
   </ItemGroup>
diff --git a/build.psm1 b/build.psm1
index 5473a0da7..094964105 100644
--- a/build.psm1
+++ b/build.psm1
@@ -187,8 +187,6 @@ function Start-ScriptAnalyzerBuild
             "$projectRoot\Engine\ScriptAnalyzer.format.ps1xml", "$projectRoot\Engine\ScriptAnalyzer.types.ps1xml"
             )
 
-        $settingsFiles = Get-Childitem "$projectRoot\Engine\Settings" | ForEach-Object -MemberName FullName
-
         $destinationDir = "$projectRoot\out\PSScriptAnalyzer"
         # this is normalizing case as well as selecting the proper location
         if ( $Framework -eq "core" ) {
@@ -231,6 +229,7 @@ function Start-ScriptAnalyzerBuild
             )
         Publish-File $itemsToCopyBinaries $destinationDirBinaries
 
+        $settingsFiles = Get-Childitem "$projectRoot\Engine\Settings" | ForEach-Object -MemberName FullName
         Publish-File $settingsFiles (Join-Path -Path $destinationDir -ChildPath Settings)
 
         # copy newtonsoft dll if net451 framework