diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 028d182f3..fc6d76f1d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -128,10 +128,8 @@ jobs:
         java-version: 7
       if: matrix.version == 'jdk8u'
       
-    - name: Select correct Xcode
-      run: |
-        rm -rf /Applications/Xcode.app
-        ln -s /Applications/Xcode_11.7.app /Applications/Xcode.app
+    - name: Select correct Xcode (11.7)
+      run: sudo xcode-select --switch /Applications/Xcode_11.7.app
 
     - name: Build macOS
       run: |
diff --git a/build-farm/platform-specific-configurations/mac.sh b/build-farm/platform-specific-configurations/mac.sh
index 6e958b5d2..d20d51099 100755
--- a/build-farm/platform-specific-configurations/mac.sh
+++ b/build-farm/platform-specific-configurations/mac.sh
@@ -24,19 +24,11 @@ export BUILD_ARGS="${BUILD_ARGS}"
 
 if [ "${JAVA_TO_BUILD}" == "${JDK8_VERSION}" ]
 then
-  XCODE_SWITCH_PATH="/Applications/Xcode.app"
   export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --with-toolchain-type=clang"
   if [ "${VARIANT}" == "${BUILD_VARIANT_OPENJ9}" ]; then
     export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --with-openssl=fetched --enable-openssl-bundling"
   fi
 else
-  if [[ "$JAVA_FEATURE_VERSION" -ge 17 ]] || [[ "${ARCHITECTURE}" == "aarch64" ]]; then
-    # JDK17 requires metal (included in full xcode) as does JDK11 on aarch64
-    XCODE_SWITCH_PATH="/Applications/Xcode.app"
-  else
-    # Command line tools used from JDK9-JDK16
-    XCODE_SWITCH_PATH="/";
-  fi
   export PATH="/Users/jenkins/ccache-3.2.4:$PATH"
   if [ "${VARIANT}" == "${BUILD_VARIANT_OPENJ9}" ]; then
     export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --with-openssl=fetched --enable-openssl-bundling"
@@ -64,9 +56,6 @@ then
   #export BUILD_ARGS="${BUILD_ARGS} --codesign-identity 'Developer ID Application: London Jamocha Community CIC'"
 fi
 
-echo "[WARNING] You may be asked for your su user password, attempting to switch Xcode version to ${XCODE_SWITCH_PATH}"
-sudo xcode-select --switch "${XCODE_SWITCH_PATH}"
-
 # No MacOS builds available of OpenJDK 7, OpenJDK 8 can boot itself just fine.
 if [ "${JDK_BOOT_VERSION}" == "7" ]; then
   echo "No jdk7 boot JDK available on MacOS using jdk8"