diff --git a/.craft.shelf b/.craft.shelf
index c3efed667f..016016b8eb 100644
--- a/.craft.shelf
+++ b/.craft.shelf
@@ -13,13 +13,6 @@ revision = 26586a9e9
 version = main
 revision = 09c0c94d067b696e70f99e80640c0407e17c85f2
 
-[craft/craft-core]
-version = master
-revision = b3c1e0d20a760afa7d00729dab4a5f29c30e6cd0
-
-[dev-utils/7zip-base]
-version = 25.00
-
 [dev-utils/cmake]
 version = latest
 
diff --git a/.github/workflows/.craft.ps1 b/.github/workflows/.craft.ps1
index bc7639e703..b3b5552589 100644
--- a/.github/workflows/.craft.ps1
+++ b/.github/workflows/.craft.ps1
@@ -1,3 +1,7 @@
+# enable handling of exit codes in powershell
+$PSNativeCommandUseErrorActionPreference=$true
+
+# define which python to use
 if ($IsWindows) {
     $python = (Get-Command py).Source
     $python=(py -c "import sys; print(sys.executable)")
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index da6a7535a8..cbb6958a05 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -40,14 +40,14 @@ jobs:
         matrix:
             include:
             - target: windows-cl-msvc2022-x86_64
-              os: windows-latest
+              os: windows-2022
               container:
             - target: macos-clang-arm64
               os: macos-latest
               container:
             - target: linux-gcc-x86_64
               os: ubuntu-latest
-              container: ghcr.io/opencloud-eu/ci-docker-desktop/appimage:latest
+              container: invent-registry.kde.org/sysadmin/ci-images/craft-appimage-alma9:latest
 
     name: ${{ matrix.target }}
 
@@ -125,6 +125,8 @@ jobs:
             & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c dev-utils/nsis
         } elseif($IsLinux) {
             & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c dev-utils/linuxdeploy
+            # ensure we have fuse3-devel installed
+            dnf install -y fuse3-devel file
         }
 
     - name: Install dependencies