diff --git a/.github/actions/llm/download-llm-binary/action.yml b/.github/actions/llm/download-llm-binary/action.yml
index 17ff4e3a..ba9f8ddf 100644
--- a/.github/actions/llm/download-llm-binary/action.yml
+++ b/.github/actions/llm/download-llm-binary/action.yml
@@ -17,7 +17,7 @@ runs:
         mv linux-avx/* python/llm/llm-binary/
         mv linux-amx/* python/llm/llm-binary/
         mv windows-avx2/* python/llm/llm-binary/
-        mv windows-avx2-vnni/* python/llm/llm-binary/
+        mv windows-avx-vnni/* python/llm/llm-binary/
         mv windows-avx/* python/llm/llm-binary/
         rm -rf linux-avx2 || true
         rm -rf linux-avx512 || true
@@ -25,5 +25,5 @@ runs:
         rm -rf linux-avx || true
         rm -rf linux-amx || true
         rm -rf windows-avx2 || true
-        rm -rf windows-avx2-vnni || true
+        rm -rf windows-avx-vnni || true
         rm -rf windows-avx || true
diff --git a/.github/workflows/llm-binary-build.yml b/.github/workflows/llm-binary-build.yml
index fee8f6d8..77d06b10 100644
--- a/.github/workflows/llm-binary-build.yml
+++ b/.github/workflows/llm-binary-build.yml
@@ -327,7 +327,7 @@ jobs:
           name: windows-avx2
 
   windows-build-avx2:
-    runs-on: [self-hosted, Windows]
+    runs-on: [self-hosted, Windows, AVX-VNNI]
     needs: check-windows-avx2-artifact
     if: needs.check-windows-avx2-artifact.outputs.if-exists == 'false'
     steps:
@@ -359,7 +359,7 @@ jobs:
           path: |
             build/Release
 
-  check-windows-avx2-vnni-artifact:
+  check-windows-avx-vnni-artifact:
     runs-on: ubuntu-latest
     outputs:
       if-exists: ${{steps.check_artifact.outputs.exists}}
@@ -368,12 +368,12 @@ jobs:
         id: check_artifact
         uses: xSAVIKx/artifact-exists-action@v0
         with:
-          name: windows-avx2-vnni
+          name: windows-avx-vnni
 
-  windows-build-avx2-vnni:
-    runs-on: [self-hosted, Windows]
-    needs: check-windows-avx2-vnni-artifact
-    if: needs.check-windows-avx2-vnni-artifact.outputs.if-exists == 'false'
+  windows-build-avx-vnni:
+    runs-on: [self-hosted, Windows, AVX-VNNI]
+    needs: check-windows-avx-vnni-artifact
+    if: needs.check-windows-avx-vnni-artifact.outputs.if-exists == 'false'
     steps:
       - name: Set up Python
         uses: actions/setup-python@v4
@@ -464,7 +464,7 @@ jobs:
       - name: Archive build files
         uses: actions/upload-artifact@v3
         with:
-          name: windows-avx2-vnni
+          name: windows-avx-vnni
           path: |
             release
 
@@ -480,7 +480,7 @@ jobs:
           name: windows-avx
 
   windows-build-avx:
-    runs-on: [self-hosted, Windows]
+    runs-on: [self-hosted, Windows, AVX-VNNI]
     needs: check-windows-avx-artifact
     if: needs.check-windows-avx-artifact.outputs.if-exists == 'false'
     steps:
diff --git a/.github/workflows/llm-nightly-test.yml b/.github/workflows/llm-nightly-test.yml
index a5a136b1..859a841a 100644
--- a/.github/workflows/llm-nightly-test.yml
+++ b/.github/workflows/llm-nightly-test.yml
@@ -30,7 +30,7 @@ jobs:
       matrix:
         include:
           - os: windows
-            instruction: avx2
+            instruction: AVX-VNNI
             python-version: "3.9"
           - os: ubuntu-20.04-lts
             instruction: avx512
diff --git a/.github/workflows/llm_unit_tests.yml b/.github/workflows/llm_unit_tests.yml
index c066f72f..0f095388 100644
--- a/.github/workflows/llm_unit_tests.yml
+++ b/.github/workflows/llm_unit_tests.yml
@@ -44,19 +44,19 @@ jobs:
       matrix:
         include:
           - os: windows
-            instruction: avx2
+            instruction: AVX-VNNI
             python-version: "3.9"
           - os: ubuntu-20.04-lts
             instruction: avx512
             python-version: "3.9"
           - os: windows
-            instruction: avx2
+            instruction: AVX-VNNI
             python-version: "3.10"
           - os: ubuntu-20.04-lts
             instruction: avx512
             python-version: "3.10"
           - os: windows
-            instruction: avx2
+            instruction: AVX-VNNI
             python-version: "3.11"
           - os: ubuntu-20.04-lts
             instruction: avx512