diff --git a/Jenkinsfile b/Jenkinsfile
index 6680af4c3..db9fd926d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -6,10 +6,10 @@ node('Node-Dev-100163') {
         }
         stage('Build') {
             sh 'make install'
+            sh 'make clean_up'
             sh 'make build_image'
         }
-        stage('Start Docker Container'){
-            sh 'make clean_up' 
+        stage('Start Docker Container'){ 
             sh 'make run_server_docker'
         }
         stage('Testing') {
diff --git a/Makefile b/Makefile
index 02a47dd0b..6be078450 100644
--- a/Makefile
+++ b/Makefile
@@ -13,8 +13,8 @@ SETUP_PATH=${PWD}/setup
 HASH := $(shell git rev-parse HEAD)
 CONFIG=odoo.conf
 ODOO_IMAGE=hub.nextzenos.com/nexterp/odoo
-CONTAINER_ID=odoo-${TAG}
 TAG := main
+CONTAINER_ID=odoo-${TAG}
 install:
 	sudo apt -y update && \
 	sudo apt install -y python3-full python3-pip libldap2-dev libpq-dev libsasl2-dev