diff --git a/files/osbs/dockercfg-production-secret.j2 b/files/osbs/dockercfg-production-secret.j2
index ff772cad8f..00d32e2fcc 100644
--- a/files/osbs/dockercfg-production-secret.j2
+++ b/files/osbs/dockercfg-production-secret.j2
@@ -1 +1 @@
-{"candidate-registry.fedoraproject.org":{"username":"{{candidate_registry_osbs_prod_username}}","password":"{{candidate_registry_osbs_prod_password}}","email":"","auth":""}}
\ No newline at end of file
+{"candidate-registry.fedoraproject.org":{"username":"{{candidate_registry_osbs_prod_username}}","password":"{{candidate_registry_osbs_prod_password}}","email":"","auth":"{{ auth_info_prod | base64encode }}"}}
\ No newline at end of file
diff --git a/files/osbs/dockercfg-staging-secret.j2 b/files/osbs/dockercfg-staging-secret.j2
index 50f04315f9..16b66c1e05 100644
--- a/files/osbs/dockercfg-staging-secret.j2
+++ b/files/osbs/dockercfg-staging-secret.j2
@@ -1 +1 @@
-{"candidate-registry.stg.fedoraproject.org":{"username":"{{candidate_registry_osbs_stg_username}}","password":"{{candidate_registry_osbs_stg_password}}","email":""}}
\ No newline at end of file
+{"candidate-registry.stg.fedoraproject.org":{"username":"{{candidate_registry_osbs_stg_username}}","password":"{{candidate_registry_osbs_stg_password}}","email":"","auth":"{{ auth_info_stg | base64encode }}"}}
\ No newline at end of file
diff --git a/playbooks/groups/osbs-cluster.yml b/playbooks/groups/osbs-cluster.yml
index 37a2de4b79..68996a3cc2 100644
--- a/playbooks/groups/osbs-cluster.yml
+++ b/playbooks/groups/osbs-cluster.yml
@@ -572,6 +572,11 @@
     - /srv/web/infra/ansible/vars/global.yml
     - "/srv/private/ansible/vars.yml"
     - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
+
+  vars:
+    auth_info_prod: "{{candidate_registry_osbs_prod_username}}:{{candidate_registry_osbs_prod_password}}"
+    auth_info_stg: "{{candidate_registry_osbs_stg_username}}:{{candidate_registry_osbs_stg_password}}"
+
   pre_tasks:
     - name: Create the dockercfg secret file
       local_action: >