diff --git a/.github/workflows/fbgemm_ci.yml b/.github/workflows/fbgemm_ci.yml
index 8486eadca3..7e2150af5f 100644
--- a/.github/workflows/fbgemm_ci.yml
+++ b/.github/workflows/fbgemm_ci.yml
@@ -36,7 +36,7 @@ jobs:
       fail-fast: false
       matrix:
         host-machine: [
-          { arch: x86, instance: "linux.12xlarge" },
+          { arch: x86, instance: "amz2023.linux.12xlarge" },
         ]
         library-type: [ static, shared ]
         compiler: [ "gcc", "clang" ]
@@ -121,7 +121,7 @@ jobs:
       fail-fast: false
       matrix:
         host-machine: [
-          { arch: x86, instance: "linux.12xlarge" },
+          { arch: x86, instance: "amz2023.linux.12xlarge" },
         ]
         compiler: [ "gcc", "clang" ]
 
diff --git a/.github/workflows/fbgemm_gpu_ci_cpu.yml b/.github/workflows/fbgemm_gpu_ci_cpu.yml
index fa5eee37c9..568465f974 100644
--- a/.github/workflows/fbgemm_gpu_ci_cpu.yml
+++ b/.github/workflows/fbgemm_gpu_ci_cpu.yml
@@ -70,8 +70,8 @@ jobs:
       fail-fast: false
       matrix:
         host-machine: [
-          { arch: x86, instance: "linux.4xlarge" },
-          { arch: arm, instance: "linux.arm64.2xlarge" },
+          { arch: x86, instance: "amz2023.linux.4xlarge" },
+          { arch: arm, instance: "amz2023.linux.arm64.2xlarge" },
         ]
         python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" ]
         compiler: [ "gcc", "clang" ]
@@ -140,8 +140,8 @@ jobs:
       fail-fast: false
       matrix:
         host-machine: [
-          { arch: x86, instance: "linux.4xlarge", timeout: 20 },
-          { arch: arm, instance: "linux.arm64.2xlarge", timeout: 30 },
+          { arch: x86, instance: "amz2023.linux.4xlarge", timeout: 20 },
+          { arch: arm, instance: "amz2023.linux.arm64.2xlarge", timeout: 30 },
         ]
         python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" ]
         compiler: [ "gcc", "clang" ]
diff --git a/.github/workflows/fbgemm_gpu_ci_cuda.yml b/.github/workflows/fbgemm_gpu_ci_cuda.yml
index 782a6e72bd..72d731e033 100644
--- a/.github/workflows/fbgemm_gpu_ci_cuda.yml
+++ b/.github/workflows/fbgemm_gpu_ci_cuda.yml
@@ -70,7 +70,7 @@ jobs:
       fail-fast: false
       matrix:
         host-machine: [
-          { arch: x86, instance: "linux.24xlarge" },
+          { arch: x86, instance: "amz2023.linux.24xlarge" },
         ]
         python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" ]
         cuda-version: [ "11.8.0", "12.4.1", "12.6.3" ]
@@ -135,7 +135,7 @@ jobs:
   # Download the built artifact from GHA, test on GPU, and push to PyPI
   test_and_publish_artifact:
     if: ${{ github.repository_owner == 'pytorch' }}
-    # runs-on: linux.4xlarge.nvidia.gpu
+    # runs-on: amz2023.linux.4xlarge.nvidia.gpu
     # Use available instance types - https://github.com/pytorch/test-infra/blob/main/.github/scale-config.yml
     runs-on: ${{ matrix.host-machine.instance }}
     defaults:
@@ -151,7 +151,7 @@ jobs:
       fail-fast: false
       matrix:
         host-machine: [
-          { arch: x86, instance: "linux.g5.4xlarge.nvidia.gpu" },
+          { arch: x86, instance: "amz2023.linux.g5.4xlarge.nvidia.gpu" },
           # TODO: Enable when A100 machine queues are reasonably small enough for doing per-PR CI
           # https://hud.pytorch.org/metrics
           # { arch: x86, instance: "linux.gcp.a100" },
diff --git a/.github/workflows/fbgemm_gpu_ci_rocm.yml b/.github/workflows/fbgemm_gpu_ci_rocm.yml
index 5e96818c62..8ec1a9ee31 100644
--- a/.github/workflows/fbgemm_gpu_ci_rocm.yml
+++ b/.github/workflows/fbgemm_gpu_ci_rocm.yml
@@ -67,7 +67,7 @@ jobs:
       fail-fast: false
       matrix:
         host-machine: [
-          { arch: x86, instance: "linux.24xlarge" },
+          { arch: x86, instance: "amz2023.linux.24xlarge" },
         ]
         container-image: [ "ubuntu:22.04" ]
         python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" ]
diff --git a/.github/workflows/fbgemm_gpu_docs.yml b/.github/workflows/fbgemm_gpu_docs.yml
index f1bb9e64f9..d5405c41f7 100644
--- a/.github/workflows/fbgemm_gpu_docs.yml
+++ b/.github/workflows/fbgemm_gpu_docs.yml
@@ -28,7 +28,7 @@ jobs:
     permissions:
       # Grant write permission here so that the generated docs can be pushed to `gh-pages` branch
       contents: write
-    runs-on: linux.2xlarge
+    runs-on: amz2023.linux.2xlarge
     container:
       image: amazonlinux:2023
       options: --user root
diff --git a/.github/workflows/fbgemm_gpu_pip.yml b/.github/workflows/fbgemm_gpu_pip.yml
index 01d755077a..abec45f20c 100644
--- a/.github/workflows/fbgemm_gpu_pip.yml
+++ b/.github/workflows/fbgemm_gpu_pip.yml
@@ -61,8 +61,8 @@ jobs:
       fail-fast: false
       matrix:
         host-machine: [
-          { arch: x86, instance: "linux.4xlarge", timeout: 20 },
-          { arch: arm, instance: "linux.arm64.2xlarge", timeout: 30 },
+          { arch: x86, instance: "amz2023.linux.4xlarge", timeout: 20 },
+          { arch: arm, instance: "amz2023.linux.arm64.2xlarge", timeout: 30 },
         ]
         python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" ]
 
@@ -122,7 +122,7 @@ jobs:
       fail-fast: false
       matrix:
         host-machine: [
-          { instance: "linux.g5.4xlarge.nvidia.gpu" },
+          { instance: "amz2023.linux.g5.4xlarge.nvidia.gpu" },
         ]
         python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" ]
         cuda-version: [ "11.8.0", "12.4.1", "12.6.3" ]
diff --git a/.github/workflows/fbgemm_gpu_release_cpu.yml b/.github/workflows/fbgemm_gpu_release_cpu.yml
index 85dc72ce65..38260c2f93 100644
--- a/.github/workflows/fbgemm_gpu_release_cpu.yml
+++ b/.github/workflows/fbgemm_gpu_release_cpu.yml
@@ -62,8 +62,8 @@ jobs:
       fail-fast: false
       matrix:
         host-machine: [
-          { arch: x86, instance: "linux.4xlarge" },
-          { arch: arm, instance: "linux.arm64.2xlarge" },
+          { arch: x86, instance: "amz2023.linux.4xlarge" },
+          { arch: arm, instance: "amz2023.linux.arm64.2xlarge" },
         ]
         python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" ]
 
@@ -131,8 +131,8 @@ jobs:
       fail-fast: false
       matrix:
         host-machine: [
-          { arch: x86, instance: "linux.4xlarge", timeout: 20 },
-          { arch: arm, instance: "linux.arm64.2xlarge", timeout: 30 },
+          { arch: x86, instance: "amz2023.linux.4xlarge", timeout: 20 },
+          { arch: arm, instance: "amz2023.linux.arm64.2xlarge", timeout: 30 },
         ]
         python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" ]
     needs: build_artifact
diff --git a/.github/workflows/fbgemm_gpu_release_cuda.yml b/.github/workflows/fbgemm_gpu_release_cuda.yml
index dd168a9c94..920c14f905 100644
--- a/.github/workflows/fbgemm_gpu_release_cuda.yml
+++ b/.github/workflows/fbgemm_gpu_release_cuda.yml
@@ -69,7 +69,7 @@ jobs:
       fail-fast: false
       matrix:
         host-machine: [
-          { arch: x86, instance: "linux.24xlarge" },
+          { arch: x86, instance: "amz2023.linux.24xlarge" },
         ]
         python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" ]
         cuda-version: [ "11.8.0", "12.4.1", "12.6.3" ]
@@ -143,7 +143,7 @@ jobs:
       fail-fast: false
       matrix:
         host-machine: [
-          { arch: x86, instance: "linux.g5.4xlarge.nvidia.gpu" },
+          { arch: x86, instance: "amz2023.linux.g5.4xlarge.nvidia.gpu" },
         ]
         python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" ]
         cuda-version: [ "11.8.0", "12.4.1", "12.6.3" ]