diff --git a/ci-scripts/Jenkinsfile-GitLab-Container b/ci-scripts/Jenkinsfile-GitLab-Container
index da85a8a282..654ad23230 100644
--- a/ci-scripts/Jenkinsfile-GitLab-Container
+++ b/ci-scripts/Jenkinsfile-GitLab-Container
@@ -246,17 +246,12 @@ pipeline {
         script {
           triggerSlaveJob ('RAN-DockerHub-Push', 'Push-to-Docker-Hub')
         }
-        post {
-          always {
-            script {
-              echo "Push to Docker-Hub OK"
-            }
-          }
-          failure {
-            script {
-              echo "Push to Docker-Hub KO"
-              currentBuild.result = 'FAILURE'
-            }
+      }
+      post {
+        failure {
+          script {
+            echo "Push to Docker-Hub KO"
+            currentBuild.result = 'FAILURE'
           }
         }
       }
diff --git a/ci-scripts/cls_containerize.py b/ci-scripts/cls_containerize.py
index dac2408062..26ce687c62 100644
--- a/ci-scripts/cls_containerize.py
+++ b/ci-scripts/cls_containerize.py
@@ -227,6 +227,8 @@ class Containerize():
 				if result is not None:
 					forceSharedImageBuild = True
 					sharedTag = 'ci-temp'
+		else:
+			forceSharedImageBuild = True
 
 		# Let's remove any previous run artifacts if still there
 		mySSH.command(self.cli + ' image prune --force', '\$', 30)