diff --git a/.github/workflows/windows-build-and-test.yml b/.github/workflows/windows-build-and-test.yml
index aea571571a4e6..dab9d37a6bb2b 100644
--- a/.github/workflows/windows-build-and-test.yml
+++ b/.github/workflows/windows-build-and-test.yml
@@ -31,8 +31,8 @@ jobs:
               if($LASTEXITCODE -ne 0) {exit $LASTEXITCODE}
           }
           
-          craft --add-blueprint-repository "https://github.com/nextcloud/craft-blueprints-kde.git|next|"
-          craft --add-blueprint-repository "https://github.com/nextcloud/desktop-client-blueprints.git|next|"
+          craft --add-blueprint-repository "https://github.com/nextcloud/craft-blueprints-kde.git|stable-4.0|"
+          craft --add-blueprint-repository "https://github.com/nextcloud/desktop-client-blueprints.git|stable-4.0|"
           craft craft
           craft --install-deps nextcloud-client
           
diff --git a/craftmaster.ini b/craftmaster.ini
index f2efa900d81f4..7bee912d2d723 100644
--- a/craftmaster.ini
+++ b/craftmaster.ini
@@ -3,7 +3,7 @@
 [General]
 Branch = master
 # CraftUrl = https://github.com/allexzander/craft.git
-CraftRevision = 62325d3f1bdbb5232812da2f976147afc4fff390
+CraftRevision = 05fc0f0e7cb6cb5e8ee7eccba400ad4a2b590657
 ShallowClone = False
 
 # Variables defined here override the default value
@@ -28,7 +28,7 @@ ShortPath/Enabled = False
 ShortPath/EnableJunctions = False
 
 Packager/RepositoryUrl = https://download.nextcloud.com/desktop/development/craftCache/
-Packager/CacheVersion = next
+Packager/CacheVersion = stable-4.0-qt-6.9.3
 ContinuousIntegration/Enabled = True
 
 Packager/UseCache = ${Variables:UseCache}
@@ -38,8 +38,8 @@ Packager/CacheDir = ${Variables:Root}\cache
 [BlueprintSettings]
 nextcloud-client.buildTests = True
 binary/mysql.useMariaDB = False
-libs/qt6.version = 6.9.2
-craft/craft-blueprints-kde.revision = next
+libs/qt6.version = 6.9.3
+craft/craft-blueprints-kde.revision = stable-4.0
 
 [windows-msvc2022_64-cl]
 Packager/PackageType = NullsoftInstallerPackager
@@ -54,6 +54,10 @@ General/ABI = macos-64-clang
 General/ABI = macos-clang-arm64
 Paths/Python = /Users/runner/hostedtoolcache/Python/3.12.3/arm64
 
+[linux-gcc-x86_64]
+General/ABI = linux-gcc-x86_64
+Paths/Python = /usr/bin/python3
+
 [Env]
 CRAFT_CODESIGN_CERTIFICATE =
 SIGN_PACKAGE = False