diff --git a/inventory/group_vars/buildvm-stg b/inventory/group_vars/buildvm-stg
index 7754c10646..a7675d22ae 100644
--- a/inventory/group_vars/buildvm-stg
+++ b/inventory/group_vars/buildvm-stg
@@ -41,6 +41,6 @@ virt_install_command: "{{ virt_install_command_one_nic }} --cpu=host-passthrough
 
 # These variables are for koji-containerbuild/osbs
 osbs_fqdn: "osbs.stg.fedoraproject.org"
-docker_registry: "registry.stg.fedoraproject.org"
+docker_registry: "candidate-registry.stg.fedoraproject.org"
 koji_root: "koji.stg.fedoraproject.org/koji"
 koji_hub: "koji.stg.fedoraproject.org/kojihub"
diff --git a/inventory/group_vars/koji-stg b/inventory/group_vars/koji-stg
index cd03391731..4395fc42fb 100644
--- a/inventory/group_vars/koji-stg
+++ b/inventory/group_vars/koji-stg
@@ -43,7 +43,7 @@ koji_weburl: "http://koji.stg.fedoraproject.org/koji"
 koji_topurl: "http://kojipkgs.fedoraproject.org/"
 
 osbs_fqdn: "osbs.stg.fedoraproject.org"
-docker_registry: "registry.stg.fedoraproject.org"
+docker_registry: "candidate-registry.stg.fedoraproject.org"
 koji_root: "koji.stg.fedoraproject.org/koji"
 koji_hub: "koji.stg.fedoraproject.org/kojihub"
 
diff --git a/inventory/group_vars/osbs-stg b/inventory/group_vars/osbs-stg
index bb0818675e..d1f1e96f69 100644
--- a/inventory/group_vars/osbs-stg
+++ b/inventory/group_vars/osbs-stg
@@ -9,8 +9,8 @@ tcp_ports: [ 80, 443, 8443]
 fas_client_groups: sysadmin-releng,fi-apprentice,sysadmin-noc,sysadmin-veteran
 sudoers: "{{ private }}/files/sudo/00releng-sudoers"
 
-docker_cert_dir: "/etc/docker/certs.d/registry.stg.fedoraproject.org"
-docker_registry: "registry.stg.fedoraproject.org"
+docker_cert_dir: "/etc/docker/certs.d/candidate-registry.stg.fedoraproject.org"
+docker_registry: "candidate-registry.stg.fedoraproject.org"
 
 osbs_url: "osbs.stg.fedoraproject.org"
 osbs_koji_username: "kojibuilder_stg"
diff --git a/playbooks/groups/osbs-master.yml b/playbooks/groups/osbs-master.yml
index f7826feea7..7f6356d22f 100644
--- a/playbooks/groups/osbs-master.yml
+++ b/playbooks/groups/osbs-master.yml
@@ -73,7 +73,7 @@
   roles:
     - {
       role: push-docker,
-        docker_cert_dir: "/etc/docker/certs.d/registry.stg.fedoraproject.org",
+        docker_cert_dir: "/etc/docker/certs.d/candidate-registry.stg.fedoraproject.org",
       when: env == "staging"
     }
     - {