diff --git a/ci-dockerfiles-sanity-check.yaml b/ci-dockerfiles-sanity-check.yaml
index 275c8d5..4fda970 100644
--- a/ci-dockerfiles-sanity-check.yaml
+++ b/ci-dockerfiles-sanity-check.yaml
@@ -72,7 +72,11 @@
     builders:
         - shell: |
             #!/bin/bash -e
-            echo "#${BUILD_NUMBER}-${GERRIT_PATCHSET_REVISION:0:8}" > ${WORKSPACE}/version.txt
+            if [ -n "${GERRIT_PATCHSET_REVISION}" ]; then
+                echo "#${BUILD_NUMBER}-${GERRIT_PATCHSET_REVISION:0:8}" > ${WORKSPACE}/version.txt
+            else
+                echo "#${BUILD_NUMBER}" > ${WORKSPACE}/version.txt
+            fi
         - build-name-setter:
             name: 'version.txt'
             file: true