diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index af1f6ffde09c1c8dd9ad4ede3ce33f3dcd4821ec..698795f2412e3507b1c4eb32b650f097b801b6ec 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -44,11 +44,7 @@ docker image:
       --cache-from $CI_REGISTRY_IMAGE:otbtf-base-cpu-basic-test
       --cache-from $CI_REGISTRY_IMAGE:otbtf-base-$CI_COMMIT_REF_NAME
       --tag $CI_REGISTRY_IMAGE:otbtf-base-$CI_COMMIT_REF_NAME
-      --build-arg OTBTESTS="true"
-      --build-arg KEEP_SRC_OTB="true"
-      --build-arg BZL_CONFIGS=""
       --build-arg BASE_IMG="ubuntu:20.04"
-      --build-arg BUILDKIT_INLINE_CACHE=1
       .
     - docker push $CI_REGISTRY_IMAGE:otbtf-base-$CI_COMMIT_REF_NAME
     - >
@@ -84,6 +80,13 @@ docker image:
       --build-arg BUILDKIT_INLINE_CACHE=1
       .
     - docker push $CI_REGISTRY_IMAGE:builder-$CI_COMMIT_REF_NAME
+  after_script:
+    - docker tag $CI_REGISTRY_IMAGE:otbtf-base-$CI_COMMIT_REF_NAME $CI_REGISTRY_IMAGE:otbtf-base-cpu-basic-test
+    - docker tag $CI_REGISTRY_IMAGE:builder-$CI_COMMIT_REF_NAME $CI_REGISTRY_IMAGE:builder-cpu-basic-test
+    - docker tag $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME $CI_REGISTRY_IMAGE:cpu-basic-test
+    - docker push $CI_REGISTRY_IMAGE:otbtf-base-cpu-basic-test
+    - docker push $CI_REGISTRY_IMAGE:builder-cpu-basic-test
+    - docker push $CI_REGISTRY_IMAGE:cpu-basic-test
 
 .static_analysis_base:
   stage: Static Analysis
@@ -165,6 +168,7 @@ deploy:
   only:
     - develop
   script:
+    - echo "Shippping!"
     - docker pull $CI_REGISTRY_IMAGE:otbtf-base-$CI_COMMIT_REF_NAME
     - docker pull $CI_REGISTRY_IMAGE:builder-$CI_COMMIT_REF_NAME
     - docker pull $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME