diff --git a/playbooks/groups/releng-compose.yml b/playbooks/groups/releng-compose.yml
index 48d4aa5595..8474051fdd 100644
--- a/playbooks/groups/releng-compose.yml
+++ b/playbooks/groups/releng-compose.yml
@@ -55,15 +55,17 @@
   - fedmsg/base
   - {
     role: "manage-container-images",
-      cert_dest_dir: "/etc/docker/certs.d/registry{{ env_suffix }}.fedoraproject.org",
+      cert_dest_dir: "/etc/docker/certs.d/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: "manage-container-images",
-      cert_dest_dir: "/etc/docker/certs.d/candidate-registry{{ env_suffix }}.fedoraproject.org",
+      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"
   }