diff --git a/roles/build-docker-image/tasks/build.yaml b/roles/build-docker-image/tasks/build.yaml
index b0ba340f3..cb6aa01fd 100644
--- a/roles/build-docker-image/tasks/build.yaml
+++ b/roles/build-docker-image/tasks/build.yaml
@@ -40,8 +40,10 @@
       --build-arg "ZUUL_SIBLINGS={{ item.siblings | join(' ') }}"
     {% endif -%}
     {% for tag in item.tags | default(['latest']) -%}
-    --tag {{ item.repository }}:change_{{ zuul.change }}_{{ tag }}
-    --tag {{ item.repository }}:{{ tag }}
+      {% if zuul.change | default(false) -%}
+        --tag {{ item.repository }}:change_{{ zuul.change }}_{{ tag }}
+      {% endif -%}
+      --tag {{ item.repository }}:{{ tag }}
     {% endfor -%}
   args:
     chdir: "{{ zuul_work_dir }}/{{ item.context }}"