diff --git a/.github/workflows/component_docker_publish_windows.yml b/.github/workflows/component_docker_publish_windows.yml
index 8e774f89c..65a5e068b 100644
--- a/.github/workflows/component_docker_publish_windows.yml
+++ b/.github/workflows/component_docker_publish_windows.yml
@@ -8,6 +8,11 @@ on:
         required: true
         type: string
   workflow_call:
+    secrets:
+      OHAI_DOCKER_HUB_ID:
+        required: true
+      OHAI_DOCKER_HUB_PASSWORD:
+        required: true
     inputs:
       TAG:
         required: true
diff --git a/.github/workflows/prerelease_windows.yml b/.github/workflows/prerelease_windows.yml
index 751f6df75..fd5e01e61 100644
--- a/.github/workflows/prerelease_windows.yml
+++ b/.github/workflows/prerelease_windows.yml
@@ -89,6 +89,19 @@ jobs:
         shell: bash
         run: build/upload_artifacts_gh.sh
 
+  packaging-docker-windows:
+    name: Build and publish Windows Docker RC images
+    needs: [ unit-test ]
+    uses: ./.github/workflows/component_docker_build_windows.yml
+    secrets:
+      DOCKER_HUB_ID: ${{secrets.OHAI_DOCKER_HUB_ID}}
+      DOCKER_HUB_PASSWORD: ${{secrets.OHAI_DOCKER_HUB_PASSWORD}}
+      PFX_CERTIFICATE_BASE64: ${{ secrets.OHAI_PFX_CERTIFICATE_BASE64 }}
+      PFX_PASSPHRASE: ${{ secrets.OHAI_PFX_PASSPHRASE }}
+    with:
+      TAG: ${{ github.event.release.tag_name }}
+      PUBLISH: true
+
   publishing-to-s3:
     name: Publish windows artifacts into s3 staging bucket
     uses: ./.github/workflows/component_windows_publish.yml
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index da6285ca1..3976b03e2 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -72,6 +72,14 @@ jobs:
       TAG:  ${{ github.event.release.tag_name }}
       ASSETS_TYPE: "all"
 
+  publish-docker-images-windows:
+    uses: ./.github/workflows/component_docker_publish_windows.yml
+    secrets:
+      OHAI_DOCKER_HUB_ID: ${{secrets.OHAI_DOCKER_HUB_ID}}
+      OHAI_DOCKER_HUB_PASSWORD: ${{secrets.OHAI_DOCKER_HUB_PASSWORD}}
+    with:
+      TAG: ${{ github.event.release.tag_name }}
+
   molecule-packaging-tests:
     uses: ./.github/workflows/component_molecule_packaging.yml
     needs: [publishing-to-s3-linux, purge-cdn]