diff --git a/.github/runs-on.yml b/.github/runs-on.yml
index 7dd76f8e31..820ca1875e 100644
--- a/.github/runs-on.yml
+++ b/.github/runs-on.yml
@@ -6,33 +6,3 @@ runners:
     family: ["c7a", "c7i", "m7a", "m7i"]
     spot: capacity-optimized
     image: ubuntu22-full-x64
-
-  self-hosted-windows-server-2022-x86-64:
-    cpu: [16, 32, 64]
-    ram: [32, 64, 128]
-    disk: default
-    family: ["c7a", "c7i", "m7a", "m7i"]
-    spot: capacity-optimized
-    image: windowscustomimage
-
-# TODO: Replace with the official Windows runner image once all required packages are available.
-# Reference: https://github.com/runs-on/runner-images-for-aws/blob/main/releases/windows22/x64/images/windows/Windows2022-Readme.md
-#
-# Currently, this image is a minimal Windows base installation and lacks many essential packages listed in the official runner image readme.
-# The goal is to transition to an AWS-compatible image that maintains **1:1 compatibility** with the official GitHub-hosted Windows image.
-#
-# **Temporary Workaround:**
-# - We are using a **custom-built image** with the required dependencies pre-installed.
-# - This custom image (AMI) is derived from our **dedicated runners** image.
-# - More details: https://runs-on.com/configuration/custom-images/
-#
-# **Next Steps:**
-# - Replace the custom image with the official Windows runner image once it becomes available.
-# - Track progress here: https://github.com/runs-on/runs-on/issues/231
-
-images:
-  windowscustomimage:
-    platform: "windows"
-    arch: "x64"
-    owner: "227107093234"
-    ami: "ami-0108ce4fb0e0704da"
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 0e69c28ed2..e39dd13758 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -53,7 +53,7 @@ jobs:
         os: ${{ fromJson(github.repository_owner == 'autonomys' &&
           '[
             "runs-on=${{ github.run_id }}/runner=self-hosted-ubuntu-22.04-x86-64",
-            "runs-on=${{ github.run_id }}/runner=self-hosted-windows-server-2022-x86-64",
+            ["self-hosted", "windows-server-2022-x86-64"],
             ["self-hosted", "macos-14-arm64"]
           ]' ||
           '["ubuntu-22.04", "windows-2022", "macos-14"]') }}
@@ -168,7 +168,7 @@ jobs:
         os: ${{ fromJson(github.repository_owner == 'autonomys' &&
           '[
             "runs-on=${{ github.run_id }}/runner=self-hosted-ubuntu-22.04-x86-64",
-            "runs-on=${{ github.run_id }}/runner=self-hosted-windows-server-2022-x86-64",
+            ["self-hosted", "windows-server-2022-x86-64"],
             ["self-hosted", "macos-14-arm64"]
           ]' ||
           '["ubuntu-22.04", "windows-2022", "macos-14"]') }}
diff --git a/.github/workflows/snapshot-build.yml b/.github/workflows/snapshot-build.yml
index fa6f85a797..b4b5b22568 100644
--- a/.github/workflows/snapshot-build.yml
+++ b/.github/workflows/snapshot-build.yml
@@ -145,11 +145,11 @@ jobs:
           - os: ${{ fromJson(github.repository_owner == 'autonomys' && '["self-hosted", "macos-14-arm64"]' || '"macos-14"') }}
             target: aarch64-apple-darwin
             suffix: macos-aarch64-${{ github.ref_name }}
-          - os: ${{ fromJson(github.repository_owner == 'autonomys' && '"runs-on=${{ github.run_id }}/runner=self-hosted-windows-server-2022-x86-64"' || '"windows-2022"') }}
+          - os: ${{ fromJson(github.repository_owner == 'autonomys' && '["self-hosted", "windows-server-2022-x86-64"]' || '"windows-2022"') }}
             target: x86_64-pc-windows-msvc
             suffix: windows-x86_64-skylake-${{ github.ref_name }}
             rustflags: "-C target-cpu=skylake"
-          - os: ${{ fromJson(github.repository_owner == 'autonomys' && '"runs-on=${{ github.run_id }}/runner=self-hosted-windows-server-2022-x86-64"' || '"windows-2022"') }}
+          - os: ${{ fromJson(github.repository_owner == 'autonomys' && '["self-hosted", "windows-server-2022-x86-64"]' || '"windows-2022"') }}
             target: x86_64-pc-windows-msvc
             suffix: windows-x86_64-v2-${{ github.ref_name }}
             rustflags: "-C target-cpu=x86-64-v2"