diff --git a/.github/workflows/windows_build.yml b/.github/workflows/build-and-push-windows-images.yml
similarity index 98%
rename from .github/workflows/windows_build.yml
rename to .github/workflows/build-and-push-windows-images.yml
index eb22a540..ed36dcf7 100644
--- a/.github/workflows/windows_build.yml
+++ b/.github/workflows/build-and-push-windows-images.yml
@@ -39,12 +39,6 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ github.token }}
 
-      - name: Login to Docker Hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.GPUCIBOT_DOCKERHUB_USER }}
-          password: ${{ secrets.GPUCIBOT_DOCKERHUB_TOKEN }}
-
       - name: "Build image: ${{ matrix.edition }} + VS${{ matrix.version }}"
         id: build_image
         uses: ./.github/actions/build-windows-image
@@ -65,6 +59,13 @@ jobs:
           cuda_version: ${{ inputs.cuda_version }}
           isolation: process
 
+      - name: Login to Docker Hub
+        if: ${{ inputs.push_image }}
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.GPUCIBOT_DOCKERHUB_USER }}
+          password: ${{ secrets.GPUCIBOT_DOCKERHUB_TOKEN }}
+
       - name: "Push image: ${{ steps.build_image.outputs.image }}"
         if: ${{ inputs.push_image }}
         id: push_image
diff --git a/.github/workflows/trigger_windows.yml b/.github/workflows/dispatch-windows.yml
similarity index 92%
rename from .github/workflows/trigger_windows.yml
rename to .github/workflows/dispatch-windows.yml
index 97ee70ed..96ac0f84 100644
--- a/.github/workflows/trigger_windows.yml
+++ b/.github/workflows/dispatch-windows.yml
@@ -1,4 +1,4 @@
-name: Build Windows Images
+name: Dispatch Windows Images
 
 concurrency:
   group: release-on-${{ github.event_name }}-from-${{ github.ref_name }}
@@ -6,10 +6,6 @@ concurrency:
 
 on:
   pull_request:
-    branches:
-      - "pull-request/[0-9]+"
-      - "feature/.*"
-    paths: [.github/actions/windows_build.yml, scripts/windows/**]
   push:
     branches:
       - "pull-request/[0-9]+"
@@ -38,7 +34,7 @@ jobs:
           # Exclude MSVC 2022 and 11.1 as it is unsupported
           - vs_version: "2022"
             cuda_version: "11.1"
-    uses: ./.github/workflows/windows_build.yml
+    uses: ./.github/workflows/build-and-push-windows-images.yml
     with:
       runner: ${{ matrix.runner }}
       win_edition: ${{ matrix.edition }}