diff --git a/deployment/deprecated/docker/docker-baremetal-ansible.yaml b/deployment/deprecated/docker/docker-baremetal-ansible.yaml
index ecfd7c1cd5..25890e34d5 100644
--- a/deployment/deprecated/docker/docker-baremetal-ansible.yaml
+++ b/deployment/deprecated/docker/docker-baremetal-ansible.yaml
@@ -168,6 +168,14 @@ outputs:
             set_fact:
               container_registry_logins: "{{ container_registry_logins_json | from_json }}"
             when:
+              - container_registry_logins_json is string
+              - container_registry_login | bool
+              - (container_registry_logins_json | length) > 0
+          - name: Set registry logins
+            set_fact:
+              container_registry_logins: "{{ container_registry_logins_json }}"
+            when:
+              - container_registry_logins_json is mapping
               - container_registry_login | bool
               - (container_registry_logins_json | length) > 0
           - include_role:
diff --git a/deployment/podman/podman-baremetal-ansible.yaml b/deployment/podman/podman-baremetal-ansible.yaml
index 5a2f9d471f..f6085e7127 100644
--- a/deployment/podman/podman-baremetal-ansible.yaml
+++ b/deployment/podman/podman-baremetal-ansible.yaml
@@ -89,6 +89,15 @@ outputs:
             set_fact:
               container_registry_logins: "{{ container_registry_logins_json | from_json }}"
             when:
+              - container_registry_logins_json is string
+              - container_registry_login | bool
+              - (container_registry_logins_json | length) > 0
+
+          - name: Set registry logins
+            set_fact:
+              container_registry_logins: "{{ container_registry_logins_json }}"
+            when:
+              - container_registry_logins_json is mapping
               - container_registry_login | bool
               - (container_registry_logins_json | length) > 0