diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fa1d3cc..4e94e02 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,7 +16,8 @@ package:
   before_script:
     - podman login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   script:
-    - podman build --pull -f Dockerfile -t "$CI_REGISTRY_IMAGE" .
+    - podman build --pull -f Dockerfile -t "$CI_REGISTRY_IMAGE" -t "$CI_REGISTRY_IMAGE:$(grep -e 'ENV VERSION=' Dockerfile | sed -e 's/.*=//')" .
     - podman push "$CI_REGISTRY_IMAGE"
+    - podman push "$CI_REGISTRY_IMAGE:$(grep -e 'ENV VERSION=' Dockerfile | sed -e 's/.*=//')"
   only:
     - master
diff --git a/Dockerfile b/Dockerfile
index b670add..81f03cc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM docker.io/library/openjdk:17-alpine
 
-ENV VERSION=2.2.1 \
-	SHA1=c4ae4900d2b0dbc0744cfde21f5120cdd5c4ae8f
+ENV VERSION=2.2.1
+ENV SHA1=c4ae4900d2b0dbc0744cfde21f5120cdd5c4ae8f
 
 RUN mkdir -p /opt/blockmap /input /output && \
 	apk add --update --no-cache su-exec binutils gettext libintl && \