diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup
index dbf02b4ad..c344090e1 100755
--- a/salt/common/tools/sbin/soup
+++ b/salt/common/tools/sbin/soup
@@ -258,10 +258,6 @@ update_version
 echo ""
 echo "Starting Salt Master service"
 systemctl start salt-master
-#echo ""
-#echo "Starting Salt Minion service"
-#systemctl start salt-minion
-#echo ""
 
 
 echo ""
diff --git a/salt/ssl/init.sls b/salt/ssl/init.sls
index 3430fedef..dfbd4c12a 100644
--- a/salt/ssl/init.sls
+++ b/salt/ssl/init.sls
@@ -242,7 +242,7 @@ msslkeyperms:
     - unless:
       # https://github.com/saltstack/salt/issues/52167
       # Will trigger 5 days (432000 sec) from cert expiration
-      - 'enddate=$(date -d "$(openssl x509 -in /etc/pki/managerssl.crt -enddate -noout | cut -d= -f2)" +%s) ; now=$(date +%s) ; expire_date=$(( now + 432000)); [ $enddate -gt $expire_date ]'
+      - 'enddate=$(date -d "$(openssl x509 -in /etc/pki/fleet.crt -enddate -noout | cut -d= -f2)" +%s) ; now=$(date +%s) ; expire_date=$(( now + 432000)); [ $enddate -gt $expire_date ]'
 
 fleetkeyperms:
   file.managed:
@@ -289,7 +289,7 @@ fbcertdir:
     - unless:
       # https://github.com/saltstack/salt/issues/52167
       # Will trigger 5 days (432000 sec) from cert expiration
-      - 'enddate=$(date -d "$(openssl x509 -in /etc/pki/filebeat.crt -enddate -noout | cut -d= -f2)" +%s) ; now=$(date +%s) ; expire_date=$(( now + 432000)); [ $enddate -gt $expire_date ]'
+      - 'enddate=$(date -d "$(openssl x509 -in /opt/so/conf/filebeat/etc/pki/filebeat.crt -enddate -noout | cut -d= -f2)" +%s) ; now=$(date +%s) ; expire_date=$(( now + 432000)); [ $enddate -gt $expire_date ]'
 
 # Convert the key to pkcs#8 so logstash will work correctly.
 filebeatpkcs:
@@ -378,7 +378,7 @@ msslkeyperms:
     - unless:
       # https://github.com/saltstack/salt/issues/52167
       # Will trigger 5 days (432000 sec) from cert expiration
-      - 'enddate=$(date -d "$(openssl x509 -in /etc/pki/managerssl.crt -enddate -noout | cut -d= -f2)" +%s) ; now=$(date +%s) ; expire_date=$(( now + 432000)); [ $enddate -gt $expire_date ]'
+      - 'enddate=$(date -d "$(openssl x509 -in /etc/pki/fleet.crt -enddate -noout | cut -d= -f2)" +%s) ; now=$(date +%s) ; expire_date=$(( now + 432000)); [ $enddate -gt $expire_date ]'
 
 fleetkeyperms:
   file.managed:
diff --git a/setup/so-setup b/setup/so-setup
index 80d028662..ea8c0e7bc 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -457,6 +457,8 @@ fi
 	if [[ $is_minion ]]; then
 		set_progress_str 20 'Accepting Salt key on manager'
 		accept_salt_key_remote >> $setup_log 2>&1
+		set_progress_str 21 'Checking if the Salt Minion needs to be updated'
+		salt-call state.apply salt.minion -l info >> $setup_log 2>&1
 	fi
 
 	if [[ $is_manager ]]; then
@@ -464,10 +466,10 @@ fi
 		salt-key -ya "$MINION_ID" >> $setup_log 2>&1
 	fi
 
-	set_progress_str 21 'Copying minion pillars to manager'
+	set_progress_str 22 'Copying minion pillars to manager'
 	copy_minion_tmp_files >> $setup_log 2>&1
 
-	set_progress_str 22 'Generating CA and checking in'
+	set_progress_str 23 'Generating CA and checking in'
 	salt_checkin >> $setup_log 2>&1
 
 	if [[ $is_manager || $is_helix ]]; then