diff --git a/salt/allowed_states.map.jinja b/salt/allowed_states.map.jinja
index 0175953b0..f3c46edb8 100644
--- a/salt/allowed_states.map.jinja
+++ b/salt/allowed_states.map.jinja
@@ -50,7 +50,6 @@
           'learn'
           ],
       'so-heavynode': [
-          'ca',
           'ssl',
           'nginx',
           'telegraf',
@@ -80,7 +79,6 @@
           'docker_clean'
           ],
       'so-fleet': [
-          'ca',
           'ssl',
           'nginx',
           'telegraf',
@@ -157,7 +155,6 @@
           'learn'
           ],
       'so-node': [
-          'ca',
           'ssl',
           'nginx',
           'telegraf',
@@ -191,7 +188,6 @@
           'learn'
           ],
       'so-sensor': [
-          'ca',
           'ssl',
           'telegraf',
           'firewall',
diff --git a/salt/top.sls b/salt/top.sls
index a8f2018a6..2b617f52d 100644
--- a/salt/top.sls
+++ b/salt/top.sls
@@ -63,7 +63,6 @@ base:
 
   '*_sensor and G@saltversion:{{saltversion}}':
     - match: compound
-    - ca
     - ssl
     - sensoroni
     - telegraf
@@ -298,7 +297,6 @@ base:
 
   '*_searchnode and G@saltversion:{{saltversion}}':
     - match: compound
-    - ca
     - ssl
     - sensoroni
     - nginx
@@ -391,7 +389,6 @@ base:
 
   '*_heavynode and G@saltversion:{{saltversion}}':
     - match: compound
-    - ca
     - ssl
     - sensoroni
     - nginx
@@ -433,7 +430,6 @@ base:
   
   '*_fleet and G@saltversion:{{saltversion}}':
     - match: compound
-    - ca
     - ssl
     - sensoroni
     - nginx
diff --git a/setup/so-functions b/setup/so-functions
index 3d88a7fdb..c3a286402 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -77,7 +77,7 @@ accept_salt_key_remote() {
 	echo "Accept the key remotely on the manager" >> "$setup_log" 2>&1
 	# Delete the key just in case.
 	$sshcmd -i /root/.ssh/so.key soremote@"$MSRV" sudo salt-key -d "$MINION_ID" -y
-	salt-call state.apply ca >> /dev/null 2>&1
+	salt-call state.show_top >> /dev/null 2>&1
 	$sshcmd -i /root/.ssh/so.key soremote@"$MSRV" sudo salt-key -a "$MINION_ID" -y
 }
 
@@ -2345,13 +2345,13 @@ salt_checkin() {
 			;;
 		*)
 			{
-				salt-call state.apply ca;
+				#salt-call state.apply ca;
 				salt-call state.apply ssl;
 			} >> "$setup_log" 2>&1
 			;;
 	esac
 	{
-		salt-call state.apply ca;
+		#salt-call state.apply ca;
 		salt-call state.apply ssl;
 		salt-call saltutil.sync_modules;
 	} >> "$setup_log" 2>&1