diff --git a/Jenkinsfile b/Jenkinsfile
index fb9a2be..e29a4b2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -57,7 +57,7 @@ pipeline {
         stage('Build Docker Image') {
             steps {
                 dockerBuild(
-                    imageName: "${IMAGE_TAG}",
+                    imageName: "${IMAGE_NAME}:${params.BUILD_ID}",
                     dockerfile: "deployments/docker/Dockerfile",
                     context: "deployments/docker"
                 )
@@ -67,7 +67,7 @@ pipeline {
         stage('Push Docker Image') {
             steps {
                 dockerPush(
-                    imageName: "${IMAGE_TAG}",
+                    imageName: "${IMAGE_NAME}:${params.BUILD_ID}",
                     registry: "${DOCKER_REGISTRY}",
                     credentialsId: "postio-bot-gitea"
                 )