diff --git a/.github/workflows/release_build.yml b/.github/workflows/release_build.yml
index 4dd841c02..2e3e33ff5 100644
--- a/.github/workflows/release_build.yml
+++ b/.github/workflows/release_build.yml
@@ -18,23 +18,23 @@ jobs:
     strategy:
       matrix:
         include:
-         - os: linux.2xlarge
+         - os: amz2023.linux.2xlarge
            python-version: 3.8
            python-tag: "py38"
            cuda-tag: "cu121"
-         - os: linux.2xlarge
+         - os: amz2023.linux.2xlarge
            python-version: 3.9
            python-tag: "py39"
            cuda-tag: "cu121"
-         - os: linux.2xlarge
+         - os: amz2023.linux.2xlarge
            python-version: '3.10'
            python-tag: "py310"
            cuda-tag: "cu121"
-         - os: linux.2xlarge
+         - os: amz2023.linux.2xlarge
            python-version: '3.11'
            python-tag: "py311"
            cuda-tag: "cu121"
-         - os: linux.2xlarge
+         - os: amz2023.linux.2xlarge
            python-version: '3.12'
            python-tag: "py312"
            cuda-tag: "cu121"
@@ -112,7 +112,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [linux.4xlarge.nvidia.gpu]
+        os: [amz2023.linux.4xlarge.nvidia.gpu]
         python-version: [3.8, 3.9, "3.10", "3.11", "3.12"]
         cuda-tag: ["cu121"]
     needs: build_on_cpu
diff --git a/.github/workflows/unittest_ci.yml b/.github/workflows/unittest_ci.yml
index edf7a9fc1..faa4b434c 100644
--- a/.github/workflows/unittest_ci.yml
+++ b/.github/workflows/unittest_ci.yml
@@ -26,7 +26,7 @@ jobs:
     strategy:
       matrix:
         include:
-         - os: linux.2xlarge
+         - os: amz2023.linux.2xlarge
           # ideally we run on 3.9 and 3.10 as well, however we are limited in resources.
            python-version: 3.8
            python-tag: "py38"
@@ -97,7 +97,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [linux.4xlarge.nvidia.gpu]
+        os: [amz2023.linux.4xlarge.nvidia.gpu]
         python-version: [3.8]
         cuda-tag: ["cu11"]
     needs: build_on_cpu
diff --git a/.github/workflows/unittest_ci_cpu.yml b/.github/workflows/unittest_ci_cpu.yml
index 5862ff8b8..d18719c7e 100644
--- a/.github/workflows/unittest_ci_cpu.yml
+++ b/.github/workflows/unittest_ci_cpu.yml
@@ -23,16 +23,16 @@ jobs:
         fail-fast: false
         matrix:
           include:
-            - os: linux.2xlarge
+            - os: amz2023.linux.2xlarge
               python-version: 3.8
               python-tag: "py38"
-            - os: linux.2xlarge
+            - os: amz2023.linux.2xlarge
               python-version: 3.9
               python-tag: "py39"
-            - os: linux.2xlarge
+            - os: amz2023.linux.2xlarge
               python-version: '3.10'
               python-tag: "py310"
-            - os: linux.2xlarge
+            - os: amz2023.linux.2xlarge
               python-version: '3.11'
               python-tag: "py311"
     uses: pytorch/test-infra/.github/workflows/linux_job.yml@main
diff --git a/docs/make.bat b/docs/make.bat
index 6fcf05b4b..061f32f91 100644
--- a/docs/make.bat
+++ b/docs/make.bat
@@ -1,35 +1,35 @@
-@ECHO OFF
-
-pushd %~dp0
-
-REM Command file for Sphinx documentation
-
-if "%SPHINXBUILD%" == "" (
-	set SPHINXBUILD=sphinx-build
-)
-set SOURCEDIR=source
-set BUILDDIR=build
-
-if "%1" == "" goto help
-
-%SPHINXBUILD% >NUL 2>NUL
-if errorlevel 9009 (
-	echo.
-	echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
-	echo.installed, then set the SPHINXBUILD environment variable to point
-	echo.to the full path of the 'sphinx-build' executable. Alternatively you
-	echo.may add the Sphinx directory to PATH.
-	echo.
-	echo.If you don't have Sphinx installed, grab it from
-	echo.https://www.sphinx-doc.org/
-	exit /b 1
-)
-
-%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
-goto end
-
-:help
-%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
-
-:end
-popd
+@ECHO OFF
+
+pushd %~dp0
+
+REM Command file for Sphinx documentation
+
+if "%SPHINXBUILD%" == "" (
+	set SPHINXBUILD=sphinx-build
+)
+set SOURCEDIR=source
+set BUILDDIR=build
+
+if "%1" == "" goto help
+
+%SPHINXBUILD% >NUL 2>NUL
+if errorlevel 9009 (
+	echo.
+	echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
+	echo.installed, then set the SPHINXBUILD environment variable to point
+	echo.to the full path of the 'sphinx-build' executable. Alternatively you
+	echo.may add the Sphinx directory to PATH.
+	echo.
+	echo.If you don't have Sphinx installed, grab it from
+	echo.https://www.sphinx-doc.org/
+	exit /b 1
+)
+
+%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
+goto end
+
+:help
+%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
+
+:end
+popd