diff --git a/src/image/.conform.yaml b/src/image/.conform.yaml
index 0c5047dc1..00f06c1ab 100644
--- a/src/image/.conform.yaml
+++ b/src/image/.conform.yaml
@@ -64,7 +64,11 @@ tasks:
       COPY src/packer.json /packer.json
       COPY src/entrypoint.sh /bin/entrypoint.sh
       RUN chmod +x /bin/entrypoint.sh
-      ENV VERSION {{ .Docker.Image.Tag }}
+      {{ if .Git.IsTag }}
+      ENV VERSION {{ .Git.Tag }}
+      {{ else }}
+      ENV VERSION {{ .Git.SHA }}
+      {{ end }}
       ENTRYPOINT ["entrypoint.sh"]
   rootfs:
     template: |