diff --git a/playbooks/groups/docker-registry.yml b/playbooks/groups/docker-registry.yml
index c4f60ae24e..97586c2cbc 100644
--- a/playbooks/groups/docker-registry.yml
+++ b/playbooks/groups/docker-registry.yml
@@ -124,13 +124,9 @@
       role: push-docker,
         docker_cert_name: "containerstable",
         docker_cert_dir: "/etc/docker/certs.d/registry.stg.fedoraproject.org",
-      when: env == "staging",
-      delegate_to: compose-x86-01.phx2.fedoraproject.org
-    }
-    - {
-      role: push-docker,
-        docker_cert_name: "containerbuild",
-        docker_cert_dir: "/etc/docker/certs.d/candidate-registry.stg.fedoraproject.org",
+        candidate_registry: "candidate-registry.stg.fedoraproject.org",
+        candidate_registry_osbs_username: "{{candidate_registry_osbs_staging_username}}",
+        candidate_registry_osbs_password: "{{candidate_registry_osbs_staging_password}}"
       when: env == "staging",
       delegate_to: compose-x86-01.phx2.fedoraproject.org
     }
@@ -138,13 +134,9 @@
       role: push-docker,
         docker_cert_name: "containerstable",
         docker_cert_dir: "/etc/docker/certs.d/registry.fedoraproject.org",
-      when: env == "production",
-      delegate_to: compose-x86-01.phx2.fedoraproject.org
-    }
-    - {
-      role: push-docker,
-        docker_cert_name: "containerbuild",
-        docker_cert_dir: "/etc/docker/certs.d/candidate-registry.fedoraproject.org",
+        candidate_registry: "candidate-registry.fedoraproject.org",
+        candidate_registry_osbs_username: "{{candidate_registry_osbs_production_username}}",
+        candidate_registry_osbs_password: "{{candidate_registry_osbs_production_password}}"
       when: env == "production",
       delegate_to: compose-x86-01.phx2.fedoraproject.org
     }
diff --git a/playbooks/groups/osbs-cluster.yml b/playbooks/groups/osbs-cluster.yml
index a876403c69..ffdc354f23 100644
--- a/playbooks/groups/osbs-cluster.yml
+++ b/playbooks/groups/osbs-cluster.yml
@@ -274,8 +274,9 @@
       }
     - {
       role: push-docker,
-        docker_cert_name: "containerbuild",
-        docker_cert_dir: "/etc/docker/certs.d/candidate-registry.stg.fedoraproject.org",
+        candidate_registry: "{{docker_registry}}",
+        candidate_registry_osbs_username: "{{candidate_registry_osbs_staging_username}}",
+        candidate_registry_osbs_password: "{{candidate_registry_osbs_staging_password}}"
       when: env == "staging"
     }
     - {
@@ -294,8 +295,9 @@
     }
     - {
       role: push-docker,
-        docker_cert_name: "containerbuild",
-        docker_cert_dir: "/etc/docker/certs.d/candidate-registry.fedoraproject.org",
+        candidate_registry: "{{docker_registry}}",
+        candidate_registry_osbs_username: "{{candidate_registry_osbs_production_username}}",
+        candidate_registry_osbs_password: "{{candidate_registry_osbs_production_password}}"
       when: env == "production"
     }
 
diff --git a/roles/push-docker/tasks/main.yml b/roles/push-docker/tasks/main.yml
index 56325014eb..be647bf82d 100644
--- a/roles/push-docker/tasks/main.yml
+++ b/roles/push-docker/tasks/main.yml
@@ -16,6 +16,7 @@
     owner: root
     group: "releng-team"
     mode: 0640
+  when: docker_cert_name is defined
 
 - name: install docker client key for registry
   copy:
@@ -24,6 +25,13 @@
     owner: root
     group: "releng-team"
     mode: 0640
+  when: docker_cert_name is defined
+
+- name: Log into the candidate-registry
+  docker_login:
+    registry: "{{candidate_registry}}"
+    username: "{{candidate_registry_osbs_username}}"
+    password: "{{candidate_registry_osbs_password}}"
 
 - name: start and enable docker
   service: name=docker state=started enabled=yes