diff --git a/salt/ssl/init.sls b/salt/ssl/init.sls
index 1cc59d73e..27a08d276 100644
--- a/salt/ssl/init.sls
+++ b/salt/ssl/init.sls
@@ -64,7 +64,7 @@ fbcrtlink:
         backup: True
 
 # Create a cert for the reverse proxy
-/etc/pki/master.crt:
+/etc/pki/masterssl.crt:
   x509.certificate_managed:
     - ca_server: {{ master }}
     - signing_policy: masterssl
diff --git a/salt/top.sls b/salt/top.sls
index 6b6b44374..1b6f8c84f 100644
--- a/salt/top.sls
+++ b/salt/top.sls
@@ -15,9 +15,9 @@ base:
     - eval
 
   'G@role:so-master':
-    - common
     - ca
     - ssl
+    - common
     - firewall
     - master
     - idstools