diff --git a/tools/cpm-fetch-all.sh b/tools/cpm-fetch-all.sh
index 66f55df94d..dce602b372 100755
--- a/tools/cpm-fetch-all.sh
+++ b/tools/cpm-fetch-all.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/bin/bash -ex
 
 # SPDX-FileCopyrightText: 2025 Eden Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later
@@ -6,6 +6,6 @@
 # SPDX-FileCopyrightText: 2025 crueter
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-LIBS=$(find . externals src/qt_common src/dynarmic -maxdepth 2 -name cpmfile.json -exec jq -j 'keys_unsorted | join(" ")' {} \; -printf " ")
+LIBS=$(find . src -maxdepth 3 -name cpmfile.json -exec jq -j 'keys_unsorted | join(" ")' {} \; -printf " ")
 
 tools/cpm-fetch.sh $LIBS
\ No newline at end of file
diff --git a/tools/cpm-fetch.sh b/tools/cpm-fetch.sh
index 6df432166e..6e18610087 100755
--- a/tools/cpm-fetch.sh
+++ b/tools/cpm-fetch.sh
@@ -78,10 +78,7 @@ ci_package() {
 
   PACKAGE=$(jq -r ".package | \"$package\"" <<< "$JSON")
 
-  # TODO(crueter)
-  DISABLED=$(jq -j '.disabled_platforms | join(" ")' <<< "$JSON")
-
-  echo $DISABLED
+  DISABLED=$(jq -j '.disabled_platforms' <<< "$JSON")
 
   [ "$REPO" = null ] && echo "No repo defined for CI package $package" && return
 
@@ -103,6 +100,10 @@ ci_package() {
     PACKAGE_NAME="$PACKAGE"
     KEY=$platform
 
+    LOWER_PACKAGE=$(tr '[:upper:]' '[:lower:]' <<< "$PACKAGE_NAME")
+    OUTDIR="${CPM_SOURCE_CACHE}/${LOWER_PACKAGE}/${KEY}"
+    [ -d "$OUTDIR" ] && continue
+
     HASH_ALGO=$(jq -r ".hash_algo" <<< "$JSON")
     [ "$HASH_ALGO" = null ] && HASH_ALGO=sha512
 
@@ -119,7 +120,7 @@ for package in $@
 do
   # prepare for cancer
   # TODO(crueter): Fetch json once?
-  JSON=$(find . externals src/qt_common src/dynarmic -maxdepth 2 -name cpmfile.json -exec jq -r ".\"$package\" | select( . != null )" {} \;)
+  JSON=$(find . src -maxdepth 3 -name cpmfile.json -exec jq -r ".\"$package\" | select( . != null )" {} \;)
 
   [ -z "$JSON" ] && echo "!! No cpmfile definition for $package" && continue