diff --git a/salt/fleet/files/dedicated-index.html b/salt/fleet/files/dedicated-index.html
index d6fead8f9..c53cae95b 100644
--- a/salt/fleet/files/dedicated-index.html
+++ b/salt/fleet/files/dedicated-index.html
@@ -102,17 +102,17 @@ a {
 					<br/>
 					Packages:
 					<ul>
-						<li><a href="/packages/launcher.msi" download="msi-launcher.msi">MSI (Windows)</a></li>
-						<li><a href="/packages/launcher.deb" download="deb-launcher.deb">DEB (Debian)</a></li>
-                        <li><a href="/packages/launcher.rpm" download="rpm-launcher.rpm">RPM (RPM)</a></li>
-                        <li><a href="/packages/launcher.pkg" download="pkg-launcher.pkg">PKG (MacOS)</a></li>
+						<li><a href="/launcher.msi" download="msi-launcher.msi">MSI (Windows)</a></li>
+						<li><a href="/launcher.deb" download="deb-launcher.deb">DEB (Debian)</a></li>
+                        <li><a href="/launcher.rpm" download="rpm-launcher.rpm">RPM (RPM)</a></li>
+                        <li><a href="/launcher.pkg" download="pkg-launcher.pkg">PKG (MacOS)</a></li>
 					</ul>
 					<br/>
 					<br/>
 					Config Files:
 					<ul>
-						<li><a href="/packages/launcher.flags" download="launcher.flags.txt">RPM & DEB Flag File</a></li>
-						<li><a href="/packages/launcher-msi.flags" download="launcher-msi.flags.txt">MSI Flag File</a></li>
+						<li><a href="/launcher.flags" download="launcher.flags.txt">RPM & DEB Flag File</a></li>
+						<li><a href="/launcher-msi.flags" download="launcher-msi.flags.txt">MSI Flag File</a></li>
 					</ul>
 				</div>
 				<br/>
diff --git a/salt/fleet/files/scripts/so-fleet-setup b/salt/fleet/files/scripts/so-fleet-setup
index 2f6628980..5bab20922 100644
--- a/salt/fleet/files/scripts/so-fleet-setup
+++ b/salt/fleet/files/scripts/so-fleet-setup
@@ -25,11 +25,12 @@ docker exec so-fleet /bin/sh -c 'for pack in /packs/palantir/Fleet/Endpoints/pac
 # Enable Fleet
 echo "Enabling Fleet..."
 salt-call state.apply fleet.event_enable-fleet queue=True >> /root/fleet-setup.log
+salt-call state.apply common queue=True >> /root/fleet-setup.log
 
 # Generate osquery install packages
-echo "Generating osquery install packages - will take some time..."
+echo "Generating osquery install packages - this will take some time..."
 salt-call state.apply fleet.event_gen-packages queue=True >> /root/fleet-setup.log
-sleep 180
+sleep 120
 
 echo "Installing launcher via salt..."
 salt-call state.apply fleet.install_package queue=True >> /root/fleet-setup.log
diff --git a/salt/fleet/init.sls b/salt/fleet/init.sls
index 52fc665bb..90069430f 100644
--- a/salt/fleet/init.sls
+++ b/salt/fleet/init.sls
@@ -50,6 +50,13 @@ fleetpacksync:
     - user: 939
     - group: 939
 
+  fleetpackagessync:
+  file.recurse:
+    - name: /opt/so/conf/fleet/packages
+    - source: salt://fleet/packages/
+    - user: 939
+    - group: 939
+
 fleetlogdir:
   file.directory:
     - name: /opt/so/log/fleet