diff --git a/Jenkinsfile b/Jenkinsfile
index 627fa590..f011a336 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -23,18 +23,17 @@ pipeline {
             } else {
               tagName = "$BRANCH_NAME"
             }
-            dockerImage = docker.build("$registry:$tagName", "--no-cache .")
-            docker.withRegistry( '', 'eeajenkins' ) {
-              dockerImage.push()
+            try {
+              dockerImage = docker.build("$registry:$tagName", "--no-cache .")
+              docker.withRegistry( '', 'eeajenkins' ) {
+                dockerImage.push()
+              }
+            } finally {
+              sh "docker rmi $registry:$tagName"
             }
           }
         }
       }
-      post {
-        always {
-          sh "docker rmi $registry:$tagName"
-        }
-      }
     }
 
     stage('Release') {