diff --git a/.github/workflows/check-clang-linux.yml b/.github/workflows/check-clang-linux.yml
index 1822ac7..f9d6c31 100644
--- a/.github/workflows/check-clang-linux.yml
+++ b/.github/workflows/check-clang-linux.yml
@@ -1,4 +1,4 @@
-name: Checked C Clang CI Linux]
+name: Checked C Clang CI [Linux]
 
 on:
   workflow_dispatch:
@@ -18,7 +18,7 @@ on:
       clang_repo:
         description: 'Clang Repo name'
         required: true
-        default: 'https://github.com/checkedc/checkedc-llvm-project.git'
+        default: 'https://github.com/checkedc/checkedc-clang.git'
       testType:
         description: 'Test Type'
         required: true
diff --git a/.github/workflows/check-clang-windows.yml b/.github/workflows/check-clang-windows.yml
index ee7e298..62a1f79 100644
--- a/.github/workflows/check-clang-windows.yml
+++ b/.github/workflows/check-clang-windows.yml
@@ -18,7 +18,7 @@ on:
       clang_repo:
         description: 'Clang Repo name'
         required: true
-        default: 'https://github.com/checkedc/checkedc-llvm-project.git'
+        default: 'https://github.com/checkedc/checkedc-clang.git'
       testType:
         description: 'Test Type'
         required: true
@@ -47,8 +47,12 @@ env:
 jobs:
   test_CheckedC_Clang_on_windows :
     name: Build Checked C clang and test it on Windows
-    runs-on: [ self-hosted, Windows, X64 ]
+    runs-on: [ windows-latest ]
     steps:
+      - name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.9'
       - name: Checkout Checked C Clang code
         uses: actions/checkout@v2
         with:
diff --git a/.github/workflows/checkedc-clang-macos.yml b/.github/workflows/checkedc-clang-macos.yml
index 10be7e7..ee9ccb1 100644
--- a/.github/workflows/checkedc-clang-macos.yml
+++ b/.github/workflows/checkedc-clang-macos.yml
@@ -18,7 +18,7 @@ on:
       clang_repo:
         description: 'Clang Repo name'
         required: true
-        default: 'https://github.com/checkedc/checkedc-llvm-project.git'
+        default: 'https://github.com/checkedc/checkedc-clang.git'
       testType:
         description: 'Test Type'
         required: true
@@ -42,7 +42,7 @@ jobs:
   # Cleanup files left behind by prior runs
   clean:
     name: Clean
-    runs-on: macOS
+    runs-on: [ macos-latest ]
     steps:
       - name: Clean
         run: |
@@ -53,10 +53,10 @@ jobs:
           rm -rf ${{env.BUILD_SOURCESDIRECTORY}}
           mkdir -p ${{env.BUILD_SOURCESDIRECTORY}}
 
-  test_CheckedC_Clang_UNIX:
+  test_CheckedC_Clang_MacOS:
     name: Build and test Checked C Clang on MacOS
     needs: clean
-    runs-on: macOS
+    runs-on: [ macos-latest ]
     steps:
       - name: Checkout Checked C Clang code
         uses: actions/checkout@v2
diff --git a/test_scripts/automation/UNIX/config-vars.sh b/test_scripts/automation/UNIX/config-vars.sh
index 844911d..1a47e1f 100755
--- a/test_scripts/automation/UNIX/config-vars.sh
+++ b/test_scripts/automation/UNIX/config-vars.sh
@@ -203,6 +203,8 @@ if [ "$CHECKEDC_CONFIG_STATUS" == "passed" ]; then
   echo "Configured environment variables:"
   echo
   echo " BUILDCONFIGURATION: $BUILDCONFIGURATION"
+  echo " CLANG_REPO: $CLANG_REPO"
+  echo " CHECKEDC_REPO: $CHECKEDC_REPO"
   echo " BUILD_PACKAGE: $BUILD_PACKAGE"
   echo " BUILDOS: $BUILDOS"
   echo " TEST_TARGET_ARCH: $TEST_TARGET_ARCH"
diff --git a/test_scripts/automation/Windows/config-vars.bat b/test_scripts/automation/Windows/config-vars.bat
index 630bbe3..e9ef121 100644
--- a/test_scripts/automation/Windows/config-vars.bat
+++ b/test_scripts/automation/Windows/config-vars.bat
@@ -52,6 +52,16 @@ if NOT DEFINED BUILDCONFIGURATION (
   exit /b 1
 )
 
+if NOT DEFINED CLANG_REPO (
+  echo CLANG_REPO not set: must be set to the URL of the Clang repository
+  exit /b /1
+)
+
+if NOT DEFINED CHECKEDC_REPO (
+  echo CHECKEDC_REPO not set: must be set to the URL of the Clang repository
+  exit /b /1
+)
+
 rem Validate build OS
 
 if NOT DEFINED BUILDOS (
@@ -195,6 +205,8 @@ if NOT DEFINED MSBUILD_CPU_COUNT (
 echo Configured environment variables:
 echo.
 echo.  BUILDCONFIGURATION: %BUILDCONFIGURATION%
+echo.  CLANG_REPO: %CLANG_REPO%
+echo.  CHECKEDC_REPO: %CHECKEDC_REPO%
 echo.  BUILDOS: %BUILDOS%
 echo.  TEST_TARGET_ARCH: %TEST_TARGET_ARCH%
 echo.  TEST_SUITE: %TEST_SUITE%
diff --git a/test_scripts/automation/Windows/run-cmake.bat b/test_scripts/automation/Windows/run-cmake.bat
index 559a44b..bf12c1c 100644
--- a/test_scripts/automation/Windows/run-cmake.bat
+++ b/test_scripts/automation/Windows/run-cmake.bat
@@ -14,7 +14,7 @@ set OLD_DIR=%CD%
 
 cd %LLVM_OBJ_DIR%
 
-cmake -G Ninja %EXTRA_FLAGS% -DCMAKE_BUILD_TYPE=%BUILDCONFIGURATION% -DLLVM_ENABLE_PROJECTS=clang -DLLVM_INSTALL_TOOLCHAIN_ONLY=ON %BUILD_SOURCESDIRECTORY%\checkedc-llvm-project\llvm
+cmake -G Ninja %EXTRA_FLAGS% -DCMAKE_BUILD_TYPE=%BUILDCONFIGURATION% -DLLVM_ENABLE_PROJECTS=clang -DLLVM_INSTALL_TOOLCHAIN_ONLY=ON %BUILD_SOURCESDIRECTORY%\checkedc-clang\llvm
 
 :succeeded
   cd %OLD_DIR%
diff --git a/test_scripts/automation/Windows/setup-files.bat b/test_scripts/automation/Windows/setup-files.bat
index 4839840..1222211 100644
--- a/test_scripts/automation/Windows/setup-files.bat
+++ b/test_scripts/automation/Windows/setup-files.bat
@@ -13,13 +13,13 @@ if "%BUILD_CHECKEDC_CLEAN%"=="Yes" (
   )
 )
  
-if not exist %BUILD_SOURCESDIRECTORY%\checkedc-llvm-project\.git (
-  git clone -c core.autocrlf=false https://github.com/checkedc/checkedc-llvm-project %BUILD_SOURCESDIRECTORY%\checkedc-llvm-project
+if not exist %BUILD_SOURCESDIRECTORY%\checkedc-clang\.git (
+  git clone -c core.autocrlf=false %CLANG_REPO% %BUILD_SOURCESDIRECTORY%\checkedc-clang
   if ERRORLEVEL 1 (goto cmdfailed)
 )
 
-if not exist %BUILD_SOURCESDIRECTORY%\checkedc-llvm-project\llvm\projects\checkedc-wrapper\checkedc\.git (
-  git clone https://github.com/checkedc/checkedc %BUILD_SOURCESDIRECTORY%\checkedc-llvm-project\llvm\projects\checkedc-wrapper\checkedc
+if not exist %BUILD_SOURCESDIRECTORY%\checkedc-clang\llvm\projects\checkedc-wrapper\checkedc\.git (
+  git clone %CHECKEDC_REPO% %BUILD_SOURCESDIRECTORY%\checkedc-clang\llvm\projects\checkedc-wrapper\checkedc
   if ERRORLEVEL 1 (goto cmdfailed)
 )
 
@@ -34,7 +34,7 @@ if "%SIGN_INSTALLER%" NEQ "No" (
 )
 
 rem Set up clang sources
-cd %BUILD_SOURCESDIRECTORY%\checkedc-llvm-project
+cd %BUILD_SOURCESDIRECTORY%\checkedc-clang
 if ERRORLEVEL 1 (goto cmdfailed)
 git fetch origin
 if ERRORLEVEL 1 (goto cmdfailed)
@@ -52,7 +52,7 @@ if not exist %LLVM_OBJ_DIR% (
 )
 
 rem set up Checked C sources
-cd %BUILD_SOURCESDIRECTORY%\checkedc-llvm-project\llvm\projects\checkedc-wrapper\checkedc
+cd %BUILD_SOURCESDIRECTORY%\checkedc-clang\llvm\projects\checkedc-wrapper\checkedc
 if ERRORLEVEL 1 (goto cmdfailed)
 git fetch origin
 if ERRORLEVEL 1 (goto cmdfailed)