diff --git a/.circleci/config.yml b/.circleci/config.yml
index 57939c3896d2..1bc821a37c9f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -290,21 +290,12 @@ jobs:
       - run:
           working_directory: ~/opencti_docker/opencti-platform
           name: Build Docker image opencti/platform
-          command: docker buildx build --platform $BUILDX_PLATFORMS -f Dockerfile_circleci -t opencti/platform:latest --load .
+          command: docker buildx build --platform $BUILDX_PLATFORMS -f Dockerfile_circleci -t opencti/platform:latest -t opencti/platform:${CIRCLE_TAG} --push .
           no_output_timeout: 30m
       - run:
           working_directory: ~/opencti_docker/opencti-worker
           name: Build Docker image opencti/worker
-          command: docker buildx build --platform $BUILDX_PLATFORMS -t opencti/worker:latest --load .
-      - run:
-          name: Publish Docker Image to Docker Hub
-          command: |
-            docker tag opencti/platform:latest opencti/platform:${CIRCLE_TAG}
-            docker tag opencti/worker:latest opencti/worker:${CIRCLE_TAG}
-            docker push opencti/platform:latest
-            docker push opencti/platform:${CIRCLE_TAG}
-            docker push opencti/worker:latest
-            docker push opencti/worker:${CIRCLE_TAG}
+          command: docker buildx build --platform $BUILDX_PLATFORMS -t opencti/worker:latest -t opencti/worker:${CIRCLE_TAG} --push .
 
   docker_build_rolling:
     working_directory: ~/opencti_docker
@@ -336,17 +327,12 @@ jobs:
       - run:
           working_directory: ~/opencti_docker/opencti-platform
           name: Build Docker image opencti/platform
-          command: docker buildx build --platform $BUILDX_PLATFORMS -f Dockerfile_circleci -t opencti/platform:rolling --load .
+          command: docker buildx build --platform $BUILDX_PLATFORMS -f Dockerfile_circleci -t opencti/platform:rolling --push .
           no_output_timeout: 30m
       - run:
           working_directory: ~/opencti_docker/opencti-worker
           name: Build Docker image opencti/worker
-          command: docker buildx build --platform $BUILDX_PLATFORMS -t opencti/worker:rolling --load .
-      - run:
-          name: Publish Docker Image to Docker Hub
-          command: |
-            docker push opencti/platform:rolling
-            docker push opencti/worker:rolling
+          command: docker buildx build --platform $BUILDX_PLATFORMS -t opencti/worker:rolling --push .
 
 workflows:
   opencti: