diff --git a/salt/registry/disabled.sls b/salt/registry/disabled.sls
index 3029b6e37..4c0b3edda 100644
--- a/salt/registry/disabled.sls
+++ b/salt/registry/disabled.sls
@@ -13,10 +13,10 @@ so-registry:
   docker_container.absent:
     - force: True
 
-so-registry_so-status.disabled:
+so-dockerregistry_so-status.disabled:
   file.comment:
     - name: /opt/so/conf/so-status/so-status.conf
-    - regex: ^so-registry$
+    - regex: ^so-dockerregistry$
 
 {% else %}
 
diff --git a/salt/registry/enabled.sls b/salt/registry/enabled.sls
index fc0e07441..0ce3ee318 100644
--- a/salt/registry/enabled.sls
+++ b/salt/registry/enabled.sls
@@ -41,10 +41,10 @@ so-dockerregistry:
       - x509: registry_crt
       - x509: registry_key
 
-delete_so-registry_so-status.disabled:
+delete_so-dockerregistry_so-status.disabled:
   file.uncomment:
     - name: /opt/so/conf/so-status/so-status.conf
-    - regex: ^so-registry$
+    - regex: ^so-dockerregistry$
 
 {% else %}
 
diff --git a/salt/registry/sostatus.sls b/salt/registry/sostatus.sls
index f4e5e5e24..ddfd187fd 100644
--- a/salt/registry/sostatus.sls
+++ b/salt/registry/sostatus.sls
@@ -6,11 +6,11 @@
 {% from 'allowed_states.map.jinja' import allowed_states %}
 {% if sls.split('.')[0] in allowed_states %}
 
-append_so-registry_so-status.conf:
+append_so-dockerregistry_so-status.conf:
   file.append:
     - name: /opt/so/conf/so-status/so-status.conf
-    - text: so-registry
-    - unless: grep -q so-registry /opt/so/conf/so-status/so-status.conf
+    - text: so-dockerregistry
+    - unless: grep -q so-dockerregistry /opt/so/conf/so-status/so-status.conf
 
 {% else %}