diff --git a/ansible/tasks/internal/optimizations.yml b/ansible/tasks/internal/optimizations.yml
index 157c35123..42a0a247c 100644
--- a/ansible/tasks/internal/optimizations.yml
+++ b/ansible/tasks/internal/optimizations.yml
@@ -10,6 +10,7 @@
     - motd-news
     - vector
     - lvm2-monitor
+    - salt-minion
   when: debpkg_mode 
 
 - name: ensure services are stopped and disabled for first boot nix build
@@ -23,6 +24,7 @@
     - fail2ban
     - motd-news
     - vector
+    - salt-minion
   when: stage2_nix
 
 - name: disable man-db
diff --git a/ebssurrogate/scripts/surrogate-bootstrap-nix.sh b/ebssurrogate/scripts/surrogate-bootstrap-nix.sh
index 5bb021d96..45cbc8ac6 100755
--- a/ebssurrogate/scripts/surrogate-bootstrap-nix.sh
+++ b/ebssurrogate/scripts/surrogate-bootstrap-nix.sh
@@ -223,11 +223,10 @@ function update_systemd_services {
 	rm -f /mnt/etc/systemd/system/multi-user.target.wants/vector.service
 	ln -s /etc/systemd/system/vector.timer /mnt/etc/systemd/system/multi-user.target.wants/vector.timer
 
-	# Disable apparmor during first boot
+	# Disable services during first boot.
 	rm -f /mnt/etc/systemd/system/sysinit.target.wants/apparmor.service
-
-	# Disable postgresql service during first boot.
 	rm -f /mnt/etc/systemd/system/multi-user.target.wants/postgresql.service
+	rm -f /mnt/etc/systemd/system/multi-user.target.wants/salt-minion.service
 
 	# Disable auditd
 	rm -f /mnt/etc/systemd/system/multi-user.target.wants/auditd.service