diff --git a/deployment/ansible/playbooks/deploy-image.yml b/deployment/ansible/playbooks/deploy-image.yml
index 6218fdd4..64ae45e2 100644
--- a/deployment/ansible/playbooks/deploy-image.yml
+++ b/deployment/ansible/playbooks/deploy-image.yml
@@ -53,6 +53,15 @@
       delegate_to: "{{ inventory_hostname }}"
       become: no
 
+    - name: Set registry accessible flag
+      ansible.builtin.set_fact:
+        registry_accessible: >-
+          {%- if registry_check.status is defined and registry_check.status | int in [200, 401] -%}
+            true
+          {%- else -%}
+            false
+          {%- endif -%}
+
     - name: Login to Docker registry
       community.docker.docker_login:
         registry_url: "{{ docker_registry }}"
@@ -60,7 +69,7 @@
         password: "{{ registry_password }}"
       when: 
         - registry_password | string | trim != ''
-        - registry_check.status | default(0) in [200, 401]
+        - registry_accessible | bool
       no_log: yes
       ignore_errors: yes
       register: docker_login_result
@@ -70,8 +79,10 @@
         name: "{{ deploy_image }}"
         source: pull
         pull: true
+      when: registry_accessible | bool
       register: image_pull_result
-      failed_when: image_pull_result.failed | default(false)
+      ignore_errors: yes
+      failed_when: false
 
     - name: Verify image exists locally
       community.docker.docker_image_info: