diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml
index 3ec8ff189a..7418bff478 100644
--- a/.github/workflows/autobuild.yml
+++ b/.github/workflows/autobuild.yml
@@ -111,7 +111,7 @@ jobs:
            - config_name:           MacOS (codeQL)
              target_os:             macos
              building_on_os:        macos-10.15
-             cmd1_prebuild:         "./autobuild/mac/codeQL/autobuild_mac_1_prepare.sh 5.15.2"
+             cmd1_prebuild:         "./autobuild/mac/codeQL/autobuild_mac_1_prepare.sh 6.2.3"
              cmd2_build:            "./autobuild/mac/codeQL/autobuild_mac_2_build.sh"
              cmd3_postbuild:        false
              uses_codeql:           true
@@ -121,11 +121,15 @@ jobs:
              target_os:             macos
              # Stay on 10.15 as long as we use dmgbuild which does not work with 11's hdiutil (?)
              building_on_os:        macos-10.15
-             cmd1_prebuild:         "./autobuild/mac/artifacts/autobuild_mac_1_prepare.sh 5.15.2"
+             cmd1_prebuild:         "./autobuild/mac/artifacts/autobuild_mac_1_prepare.sh 6.2.3"
              cmd2_build:            "./autobuild/mac/artifacts/autobuild_mac_2_build.sh sign_if_possible"
              cmd3_postbuild:        "./autobuild/mac/artifacts/autobuild_mac_3_copy_files.sh"
              uses_codeql:           false
-             xcode_version:         11.7
+             # Fix Xcode version to avoid surprises. Can be bumped after testing and checking deployment
+             # target compatibility at https://developer.apple.com/support/xcode/ and
+             # https://doc.qt.io/qt-6/macos.html
+             # Use 12.4 for now which is the last version which works on 10.15.
+             xcode_version:         12.4
 
            - config_name:           MacOS Legacy (artifacts)
              target_os:             macos