diff --git a/tools/gate/roles/build-images/tasks/airship-shipyard.yaml b/tools/gate/roles/build-images/tasks/airship-shipyard.yaml
index 6c01ef8a..379b0d58 100644
--- a/tools/gate/roles/build-images/tasks/airship-shipyard.yaml
+++ b/tools/gate/roles/build-images/tasks/airship-shipyard.yaml
@@ -28,7 +28,7 @@
   environment:
     BRANCH: "{{ zuul.branch }}"
     CHANGE: "{{ zuul.change }}"
-    COMMIT: "{{ zuul.newrev }}"
+    COMMIT: "{{ zuul.newrev | default('') }}"
     PATCHSET: "{{ zuul.patchset }}"
   register: image_tags
 
@@ -111,7 +111,7 @@
           DOCKER_REGISTRY: "quay.io"
           IMAGE_PREFIX: "airshipit"
           IMAGE_TAG: "{{ item }}"
-          COMMIT: "{{ zuul.newrev }}"
+          COMMIT: "{{ zuul.newrev | default('') }}"
           PUSH_IMAGE: "true"
       with_items: "{{ image_tags.stdout_lines }}"