diff --git a/Jenkinsfile b/Jenkinsfile
index 0612720..968faf2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -11,7 +11,8 @@ pipeline {
         stage('Build Docker Image') {
             steps {
                 script {
-                    def dockerImage = docker.build('git.thisfro.ch/jenkinsci/pflaenzli', '-f Dockerfile . --tag git.thisfro.ch/jenkinsci/pflaenzli:${env.BUILD_NUMBER} --tag git.thisfro.ch/jenkinsci/pflaenzli:latest')
+                    def buildNumber = env.BUILD_NUMBER
+                    def dockerImage = docker.build('git.thisfro.ch/jenkinsci/pflaenzli', '-f Dockerfile . --tag git.thisfro.ch/jenkinsci/pflaenzli:${buildNumber}')
                 }
             }
         }
@@ -19,7 +20,7 @@ pipeline {
         stage('Push Docker Image') {
             steps {
                 script {
-                    def numberTagImage = docker.image('git.thisfro.ch/jenkinsci/pflaenzli:${env.BUILD_NUMBER}')
+                    def numberTagImage = docker.image('git.thisfro.ch/jenkinsci/pflaenzli:${buildNumber}')
                     docker.withRegistry('https://git.thisfro.ch', 'jenkins-ci') {
                         numberTagImage.push()
                     }