diff --git a/Jenkinsfile b/Jenkinsfile
index ea74858..bf36b99 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,5 +1,5 @@
 properties([
-    buildDiscarder(logRotator(numToKeepStr: '20'))
+    buildDiscarder(logRotator(numToKeepStr: '10'))
 ])
 
 def bunBinDir() {
diff --git a/packaging/windows/farmcontrol-server.wxs b/packaging/windows/farmcontrol-server.wxs
index 67f708c..185408b 100644
--- a/packaging/windows/farmcontrol-server.wxs
+++ b/packaging/windows/farmcontrol-server.wxs
@@ -24,15 +24,21 @@
     </Directory>
 
     <DirectoryRef Id="INSTALLFOLDER">
-      <Component Id="SetupComponent" Guid="*">
+      <Component Id="SetupExeComponent" Guid="*">
         <File Id="SetupExe" Source="$(var.SetupExe)" KeyPath="yes" />
-        <File Id="SetupArchive" Source="$(var.SetupArchive)" />
-        <File Id="SetupMetadata" Source="$(var.SetupMetadata)" />
+      </Component>
+      <Component Id="SetupArchiveComponent" Guid="*">
+        <File Id="SetupArchive" Source="$(var.SetupArchive)" KeyPath="yes" />
+      </Component>
+      <Component Id="SetupMetadataComponent" Guid="*">
+        <File Id="SetupMetadata" Source="$(var.SetupMetadata)" KeyPath="yes" />
       </Component>
     </DirectoryRef>
 
     <Feature Id="MainFeature" Title="Farm Control Server" Level="1">
-      <ComponentRef Id="SetupComponent" />
+      <ComponentRef Id="SetupExeComponent" />
+      <ComponentRef Id="SetupArchiveComponent" />
+      <ComponentRef Id="SetupMetadataComponent" />
     </Feature>
 
     <CustomAction