diff --git a/roles/override-images/tasks/main.yaml b/roles/override-images/tasks/main.yaml
index 52a8ec9e6..04663ce0c 100644
--- a/roles/override-images/tasks/main.yaml
+++ b/roles/override-images/tasks/main.yaml
@@ -21,8 +21,11 @@
 
 - name: Diff
   shell: |
+      set -ex;
       for dir in openstack-helm openstack-helm-infra; do
+        path="{{ work_dir }}/../${dir}/"
+        if [ ! -d "${dir}" ]; then continue; fi
         echo "${dir} diff"
-        cd {{ work_dir }}/../${dir}/; git diff;
+        cd "${path}"; git diff; cd -;
       done
 ...