diff --git a/capz/run-capz-e2e.sh b/capz/run-capz-e2e.sh
index 4019dc2e..86581a75 100755
--- a/capz/run-capz-e2e.sh
+++ b/capz/run-capz-e2e.sh
@@ -34,6 +34,9 @@ main() {
     export HELM_VERSION=v3.15.2
     export TOOLS_BIN_DIR="${TOOLS_BIN_DIR:-$SCRIPT_ROOT/tools/bin}"
 
+    #temp for testing
+    export IMAGE_VERSION="latest"
+
     # other config
     export ARTIFACTS="${ARTIFACTS:-${PWD}/_artifacts}"
     export CLUSTER_NAME="${CLUSTER_NAME:-capz-conf-$(head /dev/urandom | LC_ALL=C tr -dc a-z0-9 | head -c 6 ; echo '')}"
diff --git a/capz/templates/gmsa-ci.yaml b/capz/templates/gmsa-ci.yaml
index 53a64e4b..a1588700 100644
--- a/capz/templates/gmsa-ci.yaml
+++ b/capz/templates/gmsa-ci.yaml
@@ -70,6 +70,13 @@ spec:
           }
         path: C:/NodeLogQueryKubeletConfig.ps1
         permissions: "0744"
+      - content: |
+          $ErrorActionPreference = "Stop"
+          # this will fix https://github.com/microsoft/Windows-Containers/issues/516
+          # since 2019 doesn't read this value, it will be ignored
+          Set-ItemProperty -Path "HKLM:\SYSTEM\CurrentControlSet\Services\hns\State" -Name "FwPerfImprovementChange" -Type DWord -Value 0
+        path: C:/apply-ws2022-networking-fixes.ps1
+        permissions: "0744"
       - content: |
           mkdir -Force c:/localdumps
           reg.exe add "HKLM\Software\Microsoft\Windows\Windows Error Reporting\LocalDumps" /V DumpCount /t REG_DWORD /d 50 /f
@@ -133,6 +140,7 @@ spec:
       - powershell C:/create-temp-folder.ps1
       - powershell C:/replace-containerd.ps1
       - powershell C:/collect-hns-crashes.ps1
+      - powershell C:/apply-ws2022-networking-fixes.ps1
       - powershell C:/replace-ci-binaries.ps1
       users:
       - groups: Administrators
diff --git a/capz/templates/gmsa-pr.yaml b/capz/templates/gmsa-pr.yaml
index f6fca0e5..d43d50e8 100644
--- a/capz/templates/gmsa-pr.yaml
+++ b/capz/templates/gmsa-pr.yaml
@@ -70,6 +70,13 @@ spec:
           }
         path: C:/NodeLogQueryKubeletConfig.ps1
         permissions: "0744"
+      - content: |
+          $ErrorActionPreference = "Stop"
+          # this will fix https://github.com/microsoft/Windows-Containers/issues/516
+          # since 2019 doesn't read this value, it will be ignored
+          Set-ItemProperty -Path "HKLM:\SYSTEM\CurrentControlSet\Services\hns\State" -Name "FwPerfImprovementChange" -Type DWord -Value 0
+        path: C:/apply-ws2022-networking-fixes.ps1
+        permissions: "0744"
       - content: |
           mkdir -Force c:/localdumps
           reg.exe add "HKLM\Software\Microsoft\Windows\Windows Error Reporting\LocalDumps" /V DumpCount /t REG_DWORD /d 50 /f
@@ -128,6 +135,7 @@ spec:
       - powershell C:/create-temp-folder.ps1
       - powershell C:/replace-containerd.ps1
       - powershell C:/collect-hns-crashes.ps1
+      - powershell C:/apply-ws2022-networking-fixes.ps1
       - powershell C:/replace-pr-binaries.ps1
       users:
       - groups: Administrators
diff --git a/capz/templates/shared-image-gallery-ci.yaml b/capz/templates/shared-image-gallery-ci.yaml
index a2ecfb9a..9258d646 100644
--- a/capz/templates/shared-image-gallery-ci.yaml
+++ b/capz/templates/shared-image-gallery-ci.yaml
@@ -70,6 +70,13 @@ spec:
           }
         path: C:/NodeLogQueryKubeletConfig.ps1
         permissions: "0744"
+      - content: |
+          $ErrorActionPreference = "Stop"
+          # this will fix https://github.com/microsoft/Windows-Containers/issues/516
+          # since 2019 doesn't read this value, it will be ignored
+          Set-ItemProperty -Path "HKLM:\SYSTEM\CurrentControlSet\Services\hns\State" -Name "FwPerfImprovementChange" -Type DWord -Value 0
+        path: C:/apply-ws2022-networking-fixes.ps1
+        permissions: "0744"
       - content: |
           mkdir -Force c:/localdumps
           reg.exe add "HKLM\Software\Microsoft\Windows\Windows Error Reporting\LocalDumps" /V DumpCount /t REG_DWORD /d 50 /f
@@ -138,6 +145,7 @@ spec:
       - powershell C:/create-temp-folder.ps1
       - powershell C:/replace-containerd.ps1
       - powershell C:/collect-hns-crashes.ps1
+      - powershell C:/apply-ws2022-networking-fixes.ps1
       - powershell C:/replace-ci-binaries.ps1
       - powershell C:/ssh-setup.ps1
       users:
diff --git a/capz/templates/windows-base.yaml b/capz/templates/windows-base.yaml
index dd6c5b4f..e4feb7cd 100644
--- a/capz/templates/windows-base.yaml
+++ b/capz/templates/windows-base.yaml
@@ -70,6 +70,13 @@ spec:
           }
         path: C:/NodeLogQueryKubeletConfig.ps1
         permissions: "0744"
+      - content: |
+          $ErrorActionPreference = "Stop"
+          # this will fix https://github.com/microsoft/Windows-Containers/issues/516
+          # since 2019 doesn't read this value, it will be ignored
+          Set-ItemProperty -Path "HKLM:\SYSTEM\CurrentControlSet\Services\hns\State" -Name "FwPerfImprovementChange" -Type DWord -Value 0
+        path: C:/apply-ws2022-networking-fixes.ps1
+        permissions: "0744"
       - content: |
           mkdir -Force c:/localdumps
           reg.exe add "HKLM\Software\Microsoft\Windows\Windows Error Reporting\LocalDumps" /V DumpCount /t REG_DWORD /d 50 /f
@@ -100,6 +107,7 @@ spec:
       - powershell C:/create-temp-folder.ps1
       - powershell C:/replace-containerd.ps1
       - powershell C:/collect-hns-crashes.ps1
+      - powershell C:/apply-ws2022-networking-fixes.ps1
       users:
       - groups: Administrators
         name: capi
diff --git a/capz/templates/windows-ci.yaml b/capz/templates/windows-ci.yaml
index 2d84fc6c..9060be5b 100644
--- a/capz/templates/windows-ci.yaml
+++ b/capz/templates/windows-ci.yaml
@@ -70,6 +70,13 @@ spec:
           }
         path: C:/NodeLogQueryKubeletConfig.ps1
         permissions: "0744"
+      - content: |
+          $ErrorActionPreference = "Stop"
+          # this will fix https://github.com/microsoft/Windows-Containers/issues/516
+          # since 2019 doesn't read this value, it will be ignored
+          Set-ItemProperty -Path "HKLM:\SYSTEM\CurrentControlSet\Services\hns\State" -Name "FwPerfImprovementChange" -Type DWord -Value 0
+        path: C:/apply-ws2022-networking-fixes.ps1
+        permissions: "0744"
       - content: |
           mkdir -Force c:/localdumps
           reg.exe add "HKLM\Software\Microsoft\Windows\Windows Error Reporting\LocalDumps" /V DumpCount /t REG_DWORD /d 50 /f
@@ -133,6 +140,7 @@ spec:
       - powershell C:/create-temp-folder.ps1
       - powershell C:/replace-containerd.ps1
       - powershell C:/collect-hns-crashes.ps1
+      - powershell C:/apply-ws2022-networking-fixes.ps1
       - powershell C:/replace-ci-binaries.ps1
       users:
       - groups: Administrators
diff --git a/capz/templates/windows-pr.yaml b/capz/templates/windows-pr.yaml
index 75ac0762..0b972474 100644
--- a/capz/templates/windows-pr.yaml
+++ b/capz/templates/windows-pr.yaml
@@ -70,6 +70,13 @@ spec:
           }
         path: C:/NodeLogQueryKubeletConfig.ps1
         permissions: "0744"
+      - content: |
+          $ErrorActionPreference = "Stop"
+          # this will fix https://github.com/microsoft/Windows-Containers/issues/516
+          # since 2019 doesn't read this value, it will be ignored
+          Set-ItemProperty -Path "HKLM:\SYSTEM\CurrentControlSet\Services\hns\State" -Name "FwPerfImprovementChange" -Type DWord -Value 0
+        path: C:/apply-ws2022-networking-fixes.ps1
+        permissions: "0744"
       - content: |
           mkdir -Force c:/localdumps
           reg.exe add "HKLM\Software\Microsoft\Windows\Windows Error Reporting\LocalDumps" /V DumpCount /t REG_DWORD /d 50 /f
@@ -128,6 +135,7 @@ spec:
       - powershell C:/create-temp-folder.ps1
       - powershell C:/replace-containerd.ps1
       - powershell C:/collect-hns-crashes.ps1
+      - powershell C:/apply-ws2022-networking-fixes.ps1
       - powershell C:/replace-pr-binaries.ps1
       users:
       - groups: Administrators