diff --git a/emu-configs/defaults/retrodeck/reference_lists/compression_targets.cfg b/emu-configs/defaults/retrodeck/reference_lists/compression_targets.cfg
index 92898b2d..4ae00365 100644
--- a/emu-configs/defaults/retrodeck/reference_lists/compression_targets.cfg
+++ b/emu-configs/defaults/retrodeck/reference_lists/compression_targets.cfg
@@ -6,14 +6,13 @@ megacd
 neogeocd
 pcenginecd
 pcfx
+psp
 psx
 ps2
 saturn
 saturnjp
 segacd
 tg-cd
-[cso]
-psp
 [rvz]
 gc
 wii
diff --git a/functions/compression.sh b/functions/compression.sh
index 5b990c3e..15bce646 100644
--- a/functions/compression.sh
+++ b/functions/compression.sh
@@ -10,13 +10,21 @@ compress_game() {
   local dest_file=$(dirname "$(realpath "$file")")"/""$filename_no_extension"
 
   if [[ "$1" == "chd" ]]; then
-    /app/bin/chdman createcd -i "$source_file" -o "$dest_file".chd
+    case "$3" in # Check platform-specific compression options
+    "psp" )
+      /app/bin/chdman createdvd --hunksize 2048 -i "$source_file" -o "$dest_file".chd -c zstd
+    ;;
+    "ps2" )
+      /app/bin/chdman createdvd -i "$source_file" -o "$dest_file".chd -c zstd
+    ;;
+    * )
+      /app/bin/chdman createcd -i "$source_file" -o "$dest_file".chd
+    ;;
+    esac
   elif [[ "$1" == "zip" ]]; then
     zip -jq9 "$dest_file".zip "$source_file"
   elif [[ "$1" == "rvz" ]]; then
     dolphin-tool convert -f rvz -b 131072 -c zstd -l 5 -i "$source_file" -o "$dest_file.rvz"
-  elif [[ "$1" == "cso" ]]; then
-    echo "TODO: maxcso command"
   fi
 }
 
diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 289285c9..1581c3a8 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -165,16 +165,19 @@ modules:
         url: https://ftp.osuosl.org/pub/blfs/conglomeration/libgudev/libgudev-237.tar.xz
         sha256: 0d06b21170d20c93e4f0534dbb9b0a8b4f1119ffb00b4031aaeb5b9148b686aa
 
-  - name: chdman-tool
-    buildsystem: simple
-    build-commands:
-      - cmake -B . -G Ninja
-      - cmake --build .
-      - cp chdman /app/bin
-    sources:
-      - type: git
-        url: https://github.com/CharlesThobe/chdman.git
-        commit: f7cadf1720cbeba8a14f2685830ff424a0c7f6cd
+  #                                           #
+  # DEPRECATED IN FAVOR OF COMPILED MAME TOOL #
+  #                                           #
+  # - name: chdman-tool
+  #   buildsystem: simple
+  #   build-commands:
+  #     - cmake -B . -G Ninja
+  #     - cmake --build .
+  #     - cp chdman /app/bin
+  #   sources:
+  #     - type: git
+  #       url: https://github.com/CharlesThobe/chdman.git
+  #       commit: f7cadf1720cbeba8a14f2685830ff424a0c7f6cd
 
   - name: rclone
     buildsystem: simple