diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml
index 643a5570f7..3d7509066c 100644
--- a/.github/workflows/autobuild.yml
+++ b/.github/workflows/autobuild.yml
@@ -102,40 +102,31 @@ jobs:
             cmd3_postbuild:         "./autobuild/linux/autobuild_deb_3_copy_files.sh"
             run_codeql:             true
 
-          - config_name:            MacOS (codeQL)
+          - config_name:            MacOS (artifacts+codeQL)
             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/codeQL/autobuild_mac_1_prepare.sh 5.15.2"
-            cmd2_build:             "./autobuild/mac/codeQL/autobuild_mac_2_build.sh"
-            cmd3_postbuild:         false
+            cmd1_prebuild:          "./autobuild/mac/autobuild_mac_1_prepare.sh 5.15.2"
+            cmd2_build:             "./autobuild/mac/autobuild_mac_2_build.sh sign_if_possible"
+            cmd3_postbuild:         "./autobuild/mac/autobuild_mac_3_copy_files.sh"
             run_codeql:             true
             xcode_version:          12.1.1
 
-          - config_name:            MacOS (artifacts)
-            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"
-            cmd2_build:             "./autobuild/mac/artifacts/autobuild_mac_2_build.sh sign_if_possible"
-            cmd3_postbuild:         "./autobuild/mac/artifacts/autobuild_mac_3_copy_files.sh"
-            run_codeql:             false
-            xcode_version:          12.1.1
-
           - config_name:            iOS (artifacts)
             target_os:              ios
             building_on_os:         macos-10.15
-            cmd1_prebuild:          "./autobuild/ios/artifacts/autobuild_ios_1_prepare.sh 5.15.2"
-            cmd2_build:             "./autobuild/ios/artifacts/autobuild_ios_2_build.sh"
-            cmd3_postbuild:         "./autobuild/ios/artifacts/autobuild_ios_3_copy_files.sh"
+            cmd1_prebuild:          "./autobuild/ios/autobuild_ios_1_prepare.sh 5.15.2"
+            cmd2_build:             "./autobuild/ios/autobuild_ios_2_build.sh"
+            cmd3_postbuild:         "./autobuild/ios/autobuild_ios_3_copy_files.sh"
             run_codeql:             false
             xcode_version:          12.1.1
 
           - config_name:            MacOS Legacy (artifacts)
             target_os:              macos
             building_on_os:         macos-10.15
-            cmd1_prebuild:          "./autobuild/mac/artifacts/autobuild_mac_1_prepare.sh 5.9.9"
-            cmd2_build:             "./autobuild/mac/artifacts/autobuild_mac_2_build.sh do_not_sign"
-            cmd3_postbuild:         "./autobuild/mac/artifacts/autobuild_mac_3_copy_files.sh legacy"
+            cmd1_prebuild:          "./autobuild/mac/autobuild_mac_1_prepare.sh 5.9.9"
+            cmd2_build:             "./autobuild/mac/autobuild_mac_2_build.sh do_not_sign"
+            cmd3_postbuild:         "./autobuild/mac/autobuild_mac_3_copy_files.sh legacy"
             run_codeql:             false
             # For Qt5 on Mac, we need to ensure SDK 10.15 is used, and not SDK 11.x.
             # Xcode 12.1 is the most-recent release which still ships SDK 10.15:
@@ -182,7 +173,7 @@ jobs:
             /usr/local/opt/qt
             ~/Library/Caches/pip
             ~/Library/Cache/jamulus-homebrew-bottles
-          key:                      ${{ matrix.config.target_os }}-${{ hashFiles('.github/workflows/autobuild.yml', 'autobuild/mac/artifacts/autobuild_mac_1_prepare.sh', 'autobuild/mac/codeQL/autobuild_mac_1_prepare.sh', 'mac/deploy_mac.sh') }}-${{ matrix.config.cmd1_prebuild }}
+          key:                      ${{ matrix.config.target_os }}-${{ hashFiles('.github/workflows/autobuild.yml', 'autobuild/mac/autobuild_mac_1_prepare.sh', 'mac/deploy_mac.sh') }}-${{ matrix.config.cmd1_prebuild }}
 
       - name:                       Cache Windows dependencies
         if:                         matrix.config.target_os == 'windows'
diff --git a/autobuild/ios/artifacts/autobuild_ios_1_prepare.sh b/autobuild/ios/autobuild_ios_1_prepare.sh
similarity index 100%
rename from autobuild/ios/artifacts/autobuild_ios_1_prepare.sh
rename to autobuild/ios/autobuild_ios_1_prepare.sh
diff --git a/autobuild/ios/artifacts/autobuild_ios_2_build.sh b/autobuild/ios/autobuild_ios_2_build.sh
similarity index 89%
rename from autobuild/ios/artifacts/autobuild_ios_2_build.sh
rename to autobuild/ios/autobuild_ios_2_build.sh
index a388838b79..5a7662eea0 100755
--- a/autobuild/ios/artifacts/autobuild_ios_2_build.sh
+++ b/autobuild/ios/autobuild_ios_2_build.sh
@@ -8,7 +8,7 @@
 ####################
 
 
-source "$(dirname "${BASH_SOURCE[0]}")/../../ensure_THIS_JAMULUS_PROJECT_PATH.sh"
+source "$(dirname "${BASH_SOURCE[0]}")/../ensure_THIS_JAMULUS_PROJECT_PATH.sh"
 
 ###################
 ###  PROCEDURE  ###
diff --git a/autobuild/ios/artifacts/autobuild_ios_3_copy_files.sh b/autobuild/ios/autobuild_ios_3_copy_files.sh
similarity index 92%
rename from autobuild/ios/artifacts/autobuild_ios_3_copy_files.sh
rename to autobuild/ios/autobuild_ios_3_copy_files.sh
index 69576ffe78..5d59791a2b 100755
--- a/autobuild/ios/artifacts/autobuild_ios_3_copy_files.sh
+++ b/autobuild/ios/autobuild_ios_3_copy_files.sh
@@ -11,7 +11,7 @@ fi
 ###  PARAMETERS  ###
 ####################
 
-source "$(dirname "${BASH_SOURCE[0]}")/../../ensure_THIS_JAMULUS_PROJECT_PATH.sh"
+source "$(dirname "${BASH_SOURCE[0]}")/../ensure_THIS_JAMULUS_PROJECT_PATH.sh"
 
 ###################
 ###  PROCEDURE  ###
diff --git a/autobuild/mac/artifacts/autobuild_mac_1_prepare.sh b/autobuild/mac/autobuild_mac_1_prepare.sh
similarity index 100%
rename from autobuild/mac/artifacts/autobuild_mac_1_prepare.sh
rename to autobuild/mac/autobuild_mac_1_prepare.sh
diff --git a/autobuild/mac/artifacts/autobuild_mac_2_build.sh b/autobuild/mac/autobuild_mac_2_build.sh
similarity index 94%
rename from autobuild/mac/artifacts/autobuild_mac_2_build.sh
rename to autobuild/mac/autobuild_mac_2_build.sh
index 8347bfe9b9..20a82573fd 100755
--- a/autobuild/mac/artifacts/autobuild_mac_2_build.sh
+++ b/autobuild/mac/autobuild_mac_2_build.sh
@@ -12,7 +12,7 @@ if [ -n "${SIGN}" ]; then
     shift
 fi
 
-source "$(dirname "${BASH_SOURCE[0]}")/../../ensure_THIS_JAMULUS_PROJECT_PATH.sh"
+source "$(dirname "${BASH_SOURCE[0]}")/../ensure_THIS_JAMULUS_PROJECT_PATH.sh"
 
 ###################
 ###  PROCEDURE  ###
diff --git a/autobuild/mac/artifacts/autobuild_mac_3_copy_files.sh b/autobuild/mac/autobuild_mac_3_copy_files.sh
similarity index 92%
rename from autobuild/mac/artifacts/autobuild_mac_3_copy_files.sh
rename to autobuild/mac/autobuild_mac_3_copy_files.sh
index 32f4205e00..71aea38683 100755
--- a/autobuild/mac/artifacts/autobuild_mac_3_copy_files.sh
+++ b/autobuild/mac/autobuild_mac_3_copy_files.sh
@@ -11,7 +11,7 @@ fi
 ###  PARAMETERS  ###
 ####################
 
-source "$(dirname "${BASH_SOURCE[0]}")/../../ensure_THIS_JAMULUS_PROJECT_PATH.sh"
+source "$(dirname "${BASH_SOURCE[0]}")/../ensure_THIS_JAMULUS_PROJECT_PATH.sh"
 
 ###################
 ###  PROCEDURE  ###
diff --git a/autobuild/mac/codeQL/autobuild_mac_1_prepare.sh b/autobuild/mac/codeQL/autobuild_mac_1_prepare.sh
deleted file mode 100755
index c71d9a4589..0000000000
--- a/autobuild/mac/codeQL/autobuild_mac_1_prepare.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash -e
-
-# autobuild_1_prepare: set up environment, install Qt & dependencies
-
-if [ "$#" -ne "1" ]; then
-    echo "need to specify Qt version"
-    exit 1
-fi
-
-QT_DIR=/usr/local/opt/qt
-QT_VER=$1
-AQTINSTALL_VERSION=2.0.5
-
-###################
-###  PROCEDURE  ###
-###################
-
-if [[ -d "${QT_DIR}" ]]; then
-    echo "Using Qt installation from previous run (actions/cache)"
-else
-    echo "Install dependencies..."
-    python3 -m pip install "aqtinstall==${AQTINSTALL_VERSION}"
-    python3 -m aqt install-qt --outputdir "${QT_DIR}" mac desktop ${QT_VER}
-fi
-
-# Add the qt binaries to the PATH.
-# The clang_64 entry can be dropped when Qt <6.2 compatibility is no longer needed.
-for qt_path in "${QT_DIR}"/${QT_VER}/macos/bin "${QT_DIR}"/${QT_VER}/clang_64/bin; do
-    if [[ -d $qt_path ]]; then
-		export -p PATH="${qt_path}:${PATH}"
-        break
-    fi
-done
-echo "::set-env name=PATH::${PATH}"
-echo "the path is ${PATH}"
diff --git a/autobuild/mac/codeQL/autobuild_mac_2_build.sh b/autobuild/mac/codeQL/autobuild_mac_2_build.sh
deleted file mode 100755
index 166a8f9660..0000000000
--- a/autobuild/mac/codeQL/autobuild_mac_2_build.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-# autobuild_2_build: actual build process
-
-
-####################
-###  PARAMETERS  ###
-####################
-
-source "$(dirname "${BASH_SOURCE[0]}")/../../ensure_THIS_JAMULUS_PROJECT_PATH.sh"
-
-###################
-###  PROCEDURE  ###
-###################
-
-cd "${THIS_JAMULUS_PROJECT_PATH}"
-
-
-echo "Building... qmake"
-qmake
-
-echo "Building... make"
-make -j "$(sysctl -n hw.ncpu)"
-
-
-echo "Done"