diff --git a/roles/promote-container-image/tasks/main.yaml b/roles/promote-container-image/tasks/main.yaml
index 8bd84f584..e2a42c2d0 100644
--- a/roles/promote-container-image/tasks/main.yaml
+++ b/roles/promote-container-image/tasks/main.yaml
@@ -10,6 +10,7 @@
 
 - name: Verify repository permission
   when: |
+    container_registry_credentials[zj_image.registry].repository is defined and
     not zj_image.repository | regex_search(container_registry_credentials[zj_image.registry].repository)
   loop: "{{ container_images }}"
   loop_control:
diff --git a/roles/upload-container-image/tasks/main.yaml b/roles/upload-container-image/tasks/main.yaml
index a2cfa25ec..063097588 100644
--- a/roles/upload-container-image/tasks/main.yaml
+++ b/roles/upload-container-image/tasks/main.yaml
@@ -10,6 +10,7 @@
 
 - name: Verify repository permission
   when: |
+    container_registry_credentials[zj_image.registry].repository is defined and
     not zj_image.repository | regex_search(container_registry_credentials[zj_image.registry].repository)
   loop: "{{ container_images }}"
   loop_control: