diff --git a/.craft.shelf b/.craft.shelf
index 51f9d44bfeb..9c0dcb743ef 100644
--- a/.craft.shelf
+++ b/.craft.shelf
@@ -1,16 +1,16 @@
 [General]
 version = 2
-blueprintrepositories = https://github.com/DeepDiver1975/craft-blueprints-kde.git|master|;https://github.com/owncloud/craft-blueprints-owncloud.git|master|
+blueprintrepositories = https://github.com/DeepDiver1975/craft-blueprints-kde.git|5+openssl+dbus|;https://github.com/owncloud/craft-blueprints-owncloud.git|master|
 
 [core/cacert]
 version = 2023-01-10
 
 [craft/craft-blueprints-kde]
-version = master
-revision = 9be073decbb06b7425655806c4e57ccc85ea2117
+version = 5+openssl+dbus
 
 [craft/craft-blueprints-owncloud]
 version = 5
+revision = e7e98ec5da0210d74ddf229718c39f73be928069
 
 [craft/craft-core]
 version = master
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b32bd7efd35..3f698d04904 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -39,11 +39,6 @@ jobs:
               os: macos-latest
               fetch-depth: 1
               container:
-            - name: macos-clang-arm64-debug
-              target: macos-clang-arm64-debug
-              os: macos-latest
-              fetch-depth: 1
-              container:
 
     name: ${{ matrix.name }}
 
@@ -63,12 +58,6 @@ jobs:
         fetch-depth: ${{ matrix.fetch-depth }}
         submodules: true
 
-    - name: Restore cache
-      uses: actions/cache@v4
-      with:
-        path: ~/cache
-        key: ${{ runner.os }}-${{ matrix.target }}
-
     - name: Clone CraftMaster
       run: git clone --depth=1 https://invent.kde.org/kde/craftmaster.git "$env:HOME/craft/CraftMaster/CraftMaster"
 
@@ -97,12 +86,6 @@ jobs:
 
     - name: Build
       run: |
-        if ("${{ matrix.target }}" -eq "macos-64-clang-debug" ) {
-            # https://api.kde.org/ecm/module/ECMEnableSanitizers.html
-            # address;leak;undefined
-            # clang: error: unsupported option '-fsanitize=leak' for target 'x86_64-apple-darwin21.6.0'
-            & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --set args="-DECM_ENABLE_SANITIZERS='address;undefined'" owncloud/owncloud-client
-        }
         if ("${{ matrix.target }}" -eq "windows-cl-msvc2022-x86_64") {
             & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --no-cache --src-dir "${env:GITHUB_WORKSPACE}" --configure owncloud/owncloud-client
             $env:BUILD_DIR = $(& "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --get buildDir -q owncloud-client)