diff --git a/playbooks/groups/docker-registry.yml b/playbooks/groups/docker-registry.yml
index 90c540ed76..a35e6e2f2c 100644
--- a/playbooks/groups/docker-registry.yml
+++ b/playbooks/groups/docker-registry.yml
@@ -125,8 +125,8 @@
         docker_cert_name: "containerstable",
         docker_cert_dir: "/etc/docker/certs.d/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}}",
+        candidate_registry_osbs_username: "{{candidate_registry_osbs_stg_username}}",
+        candidate_registry_osbs_password: "{{candidate_registry_osbs_stg_password}}",
       when: env == "staging",
       delegate_to: compose-x86-01.phx2.fedoraproject.org
     }
@@ -135,8 +135,8 @@
         docker_cert_name: "containerstable",
         docker_cert_dir: "/etc/docker/certs.d/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}}",
+        candidate_registry_osbs_username: "{{candidate_registry_osbs_prod_username}}",
+        candidate_registry_osbs_password: "{{candidate_registry_osbs_prod_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 d6101dd28b..1d94cc6cdb 100644
--- a/playbooks/groups/osbs-cluster.yml
+++ b/playbooks/groups/osbs-cluster.yml
@@ -275,8 +275,8 @@
     - {
       role: push-docker,
         candidate_registry: "{{docker_registry}}",
-        candidate_registry_osbs_username: "{{candidate_registry_osbs_staging_username}}",
-        candidate_registry_osbs_password: "{{candidate_registry_osbs_staging_password}}",
+        candidate_registry_osbs_username: "{{candidate_registry_osbs_stg_username}}",
+        candidate_registry_osbs_password: "{{candidate_registry_osbs_stg_password}}",
       when: env == "staging"
     }
     - {
@@ -296,8 +296,8 @@
     - {
       role: push-docker,
         candidate_registry: "{{docker_registry}}",
-        candidate_registry_osbs_username: "{{candidate_registry_osbs_production_username}}",
-        candidate_registry_osbs_password: "{{candidate_registry_osbs_production_password}}",
+        candidate_registry_osbs_username: "{{candidate_registry_osbs_prod_username}}",
+        candidate_registry_osbs_password: "{{candidate_registry_osbs_prod_password}}",
       when: env == "production"
     }