diff --git a/.github/workflows/build-oss.yml b/.github/workflows/build-oss.yml
index 73b8fe1efa..35dac48bcf 100644
--- a/.github/workflows/build-oss.yml
+++ b/.github/workflows/build-oss.yml
@@ -78,6 +78,13 @@ jobs:
           password: ${{ steps.auth.outputs.access_token }}
         if: ${{ inputs.authenticated }}
 
+      - name: DockerHub Login
+        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+        if: ${{ inputs.authenticated }}
+
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
@@ -187,13 +194,6 @@ jobs:
           mkdir -p "${{ inputs.image }}-results/"
         if: ${{ inputs.authenticated && steps.build-push.conclusion == 'success' }}
 
-      - name: DockerHub Login for Docker Scout
-        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-        if: ${{ inputs.authenticated && steps.build-push.conclusion == 'success' }}
-
       - name: Run Docker Scout vulnerability scanner
         id: docker-scout
         uses: docker/scout-action@f8c776824083494ab0d56b8105ba2ca85c86e4de # v1.18.2
diff --git a/.github/workflows/build-plus.yml b/.github/workflows/build-plus.yml
index 5f4ca90f84..97003ccd48 100644
--- a/.github/workflows/build-plus.yml
+++ b/.github/workflows/build-plus.yml
@@ -80,6 +80,13 @@ jobs:
           password: ${{ steps.auth.outputs.access_token }}
         if: ${{ inputs.authenticated }}
 
+      - name: DockerHub Login
+        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+        if: ${{ inputs.authenticated }}
+
       - name: NAP modules
         id: nap_modules
         run: |
@@ -203,13 +210,6 @@ jobs:
           mkdir -p "${{ inputs.image }}-results/"
         if: ${{ inputs.authenticated && steps.build-push.conclusion == 'success' }}
 
-      - name: DockerHub Login for Docker Scout
-        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-        if: ${{ inputs.authenticated && steps.build-push.conclusion == 'success' }}
-
       - name: Run Docker Scout vulnerability scanner
         id: docker-scout
         uses: docker/scout-action@f8c776824083494ab0d56b8105ba2ca85c86e4de # v1.18.2