diff --git a/roles/adoption_osp_deploy/tasks/login_registries.yml b/roles/adoption_osp_deploy/tasks/login_registries.yml
index 2eba3d5496..6eae8824b8 100644
--- a/roles/adoption_osp_deploy/tasks/login_registries.yml
+++ b/roles/adoption_osp_deploy/tasks/login_registries.yml
@@ -41,10 +41,14 @@
         msg: "{{ _current_rh_release.stdout }}"
 
 - name: Login in container registry
+  vars:
+    _container_user: "{{ cifmw_adoption_osp_deploy_container_user|default(cifmw_registry_token.credentials.username, True) }}"
+    _container_password: "{{ cifmw_adoption_osp_deploy_container_password|default(cifmw_registry_token.credentials.password, True) }}"
+    _container_registry: "{{ cifmw_adoption_osp_deploy_container_registry|default(cifmw_registry_token_registry_url, True) }}"
   when:
-    - cifmw_adoption_osp_deploy_container_user is defined
-    - cifmw_adoption_osp_deploy_container_password is defined
-    - cifmw_adoption_osp_deploy_container_registry is defined
+    - _container_user is defined
+    - _container_password is defined
+    - _container_registry is defined
   block:
     - name: Install podman for container registry login
       become: true
@@ -57,9 +61,9 @@
       no_log: true
       ansible.builtin.command: >
         podman login
-        --username "{{ cifmw_adoption_osp_deploy_container_user }}"
-        --password "{{ cifmw_adoption_osp_deploy_container_password }}"
-        {{ cifmw_adoption_osp_deploy_container_registry }}
+        --username "{{ _container_user }}"
+        --password "{{ _container_password }}"
+        {{ _container_registry }}
       loop:
         - zuul
         - root