diff --git a/.github/workflows/build-keytools-windows.yml b/.github/workflows/build-keytools-windows.yml
new file mode 100644
index 000000000..5eea2bf8d
--- /dev/null
+++ b/.github/workflows/build-keytools-windows.yml
@@ -0,0 +1,39 @@
+name: Build Windows Keytools executables
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches: [ '*' ]
+
+jobs:
+  build-windows:
+    runs-on: windows-latest
+
+    steps:
+    # Step 1: Checkout the repository
+    - name: Checkout Code
+      uses: actions/checkout@v3
+
+    # Step 2: Set up MSBuild
+    - name: Set up MSBuild Environment
+      shell: powershell
+      run: |
+        # Ensure Visual Studio Build Tools are installed
+        choco install visualstudio2022buildtools --yes
+        choco install visualstudio2022-workload-vctools --yes
+
+    # Step 3: Build the solution
+    - name: Build Solution
+      shell: cmd
+      run: |
+        "C:\Program Files\Microsoft Visual Studio\2022\BuildTools\MSBuild\Current\Bin\MSBuild.exe" tools/keytools/wolfBootKeyTools.sln /p:Configuration=Release /p:Platform="x64"
+
+    # Step 4: Upload executables as artifacts
+    - name: Upload EXE Artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        name: windows-keytools
+        path: |
+          tools\keytools\*.exe