diff --git a/.github/workflows/build-ci-container-windows.yml b/.github/workflows/build-ci-container-windows.yml
index 3996948bb44e03..12717409804737 100644
--- a/.github/workflows/build-ci-container-windows.yml
+++ b/.github/workflows/build-ci-container-windows.yml
@@ -17,8 +17,10 @@ on:
 
 jobs:
   build-ci-container-windows:
-    if: github.repository_owner == 'llvm'
+    # if: github.repository_owner == 'llvm'
     runs-on: windows-2022
+    permissions:
+      packages: write
     outputs:
       container-name: ${{ steps.vars.outputs.container-name }}
       container-name-tag: ${{ steps.vars.outputs.container-name-tag }}
@@ -32,23 +34,29 @@ jobs:
         id: vars
         run: |
           $tag = [int64](Get-Date -UFormat %s)
-          $container_name="ghcr.io/$env:GITHUB_REPOSITORY_OWNER/ci-windows-2022"
+          $container_name="ghcr.io/$($env:GITHUB_REPOSITORY_OWNER.ToLower())/ci-windows-2022"
           echo "container-name=${container_name}" >> $env:GITHUB_OUTPUT
           echo "container-name-tag=${container_name}:${tag}" >> $env:GITHUB_OUTPUT
           echo "container-filename=ci-windows-${tag}.tar" >> $env:GITHUB_OUTPUT
       - name: Build Container
         working-directory: .github/workflows/containers/github-action-ci-windows
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           docker build -t ${{ steps.vars.outputs.container-name-tag }} .
-      - name: Save container image
-        run: |
-          docker save  ${{ steps.vars.outputs.container-name-tag }} >  ${{ steps.vars.outputs.container-filename }}
-      - name: Upload container image
-        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
-        with:
-          name: container
-          path: ${{ steps.vars.outputs.container-filename }}
-          retention-days: 14
+          docker tag ${{ steps.vars.outputs.container-name-tag }} ${{ steps.vars.outputs.container-name }}:latest
+          docker login -u ${{ github.actor }} -p $env:GITHUB_TOKEN ghcr.io
+          docker push ${{ steps.vars.outputs.container-name-tag }}
+          docker push ${{ steps.vars.outputs.container-name }}:latest
+      # - name: Save container image
+      #   run: |
+      #     docker save  ${{ steps.vars.outputs.container-name-tag }} >  ${{ steps.vars.outputs.container-filename }}
+      # - name: Upload container image
+      #   uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+      #   with:
+      #     name: container
+      #     path: ${{ steps.vars.outputs.container-filename }}
+      #     retention-days: 14
   
   push-ci-container:
     if: github.event_name == 'push'
diff --git a/.github/workflows/containers/github-action-ci-windows/Dockerfile b/.github/workflows/containers/github-action-ci-windows/Dockerfile
index f1e4f1538540b3..826f84f7cdeb1d 100644
--- a/.github/workflows/containers/github-action-ci-windows/Dockerfile
+++ b/.github/workflows/containers/github-action-ci-windows/Dockerfile
@@ -48,7 +48,8 @@ RUN regsvr32 /S "C:\BuildTools\DIA SDK\bin\amd64\msdia140.dll" & \
 RUN choco install -y ninja --version 1.13.1 && \
     choco install -y git --version 2.50.1 && \
     choco install -y sccache --version 0.10.0 && \
-    choco install -y python3 --version 3.9.7
+    choco install -y python3 --version 3.9.7 && \
+    choco install -y make
 
 # Testing requires psutil
 RUN pip install psutil