diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1957c1a..fbb33ba 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ env:
   CHART_PATH: ./opensource
 
 jobs:
-  setup-docker:
+  build-and-push-docker-api:
     runs-on: ubuntu-latest
 
     steps:
@@ -28,26 +28,12 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-  build-and-push-docker-api:
-    runs-on: ubuntu-latest
-    needs: setup-docker
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-        with:
-          install: true
-
       - name: Build and push Docker image API
         run: |
           docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:latest ./src/api
 
   build-and-push-docker-job:
     runs-on: ubuntu-latest
-    needs: setup-docker
 
     steps:
       - name: Checkout repository
@@ -58,6 +44,12 @@ jobs:
         with:
           install: true
 
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
       - name: Build and push Docker image Job
         run: |
           docker buildx build --platform linux/amd64,linux/arm64 --push -t ${{ env.IMAGE_NAME }}:job-latest ./src