diff --git a/playbooks/groups/osbs-cluster.yml b/playbooks/groups/osbs-cluster.yml
index eb4eeafe47..f923fc1f1a 100644
--- a/playbooks/groups/osbs-cluster.yml
+++ b/playbooks/groups/osbs-cluster.yml
@@ -282,13 +282,6 @@
         candidate_registry_osbs_password: "{{candidate_registry_osbs_stg_password}}",
       when: env == "staging"
     }
-    - {
-      role: "manage-container-images",
-        cert_dest_dir: "/etc/docker/certs.d/candidate-registry.stg.fedoraproject.org",
-        cert_src: "{{private}}/files/docker-registry/{{env}}/docker-registry-internal.pem",
-        key_src: "{{private}}/files/docker-registry/{{env}}/docker-registry-internal.key",
-      when: env == "staging"
-    }
     - {
       role: push-docker,
         candidate_registry: "{{docker_registry}}",
@@ -298,10 +291,9 @@
     }
     - {
       role: "manage-container-images",
-        cert_dest_dir: "/etc/docker/certs.d/registry.fedoraproject.org",
+        cert_dest_dir: "/etc/docker/certs.d/candidate-registry{{ env_suffix }}.fedoraproject.org",
         cert_src: "{{private}}/files/docker-registry/{{env}}/docker-registry-internal.pem",
         key_src: "{{private}}/files/docker-registry/{{env}}/docker-registry-internal.key",
-      when: env == "production"
     }