diff --git a/functions/prepare_component.sh b/functions/prepare_component.sh
index 79956f6f..d4c38015 100644
--- a/functions/prepare_component.sh
+++ b/functions/prepare_component.sh
@@ -490,6 +490,15 @@ prepare_component() {
         set_setting_value "$pcsx2conf" "SaveStates" "$states_folder/ps2/pcsx2" "pcsx2" "Folders"
         set_setting_value "$pcsx2conf" "MemoryCards" "$saves_folder/ps2/pcsx2/memcards" "pcsx2" "Folders"
         set_setting_value "$pcsx2conf" "RecursivePaths" "$roms_folder/ps2" "pcsx2" "GameList"
+        set_setting_value "$pcsx2conf" "Cheats" "$cheats_folder/pcsx2"
+        if [[ -d "$cheats_folder/pcsx2" && "$(ls -A $cheats_folder/pcsx2)" ]]; then
+          backup_file="$backup_folder/cheats/pcsx2-$(date +%y%m%d).tar.gz"
+          create_dir "$(dirname "$backup_file")"
+          tar -czf "$backup_file" -C "$cheats_folder" pcsx2
+          log i "PCSX2 cheats backed up to $backup_file"
+        fi
+        create_dir -d "$cheats_folder/pcsx2"
+        tar -xzf /app/retrodeck/cheats/pcsx2.tar.gz -C "$cheats_folder/pcsx2" --overwrite
       fi
       # Shared actions
       create_dir "$saves_folder/ps2/pcsx2/memcards"
diff --git a/net.retrodeck.retrodeck.metainfo.xml b/net.retrodeck.retrodeck.metainfo.xml
index 28b39157..e5f09719 100644
--- a/net.retrodeck.retrodeck.metainfo.xml
+++ b/net.retrodeck.retrodeck.metainfo.xml
@@ -67,6 +67,7 @@
                <ul>
                   <li>New CLI argument `--set` to set presets, call retrodeck with `--set help` for more information</li>
                   <li>RETROARCH: added a basic cheats support</li>
+                  <li>PCSX2: added basic cheats support</li>
                </ul>
                <p>Bug fixes:</p>
                <ul>
diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 8c26ba3f..dfe1d616 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -396,6 +396,16 @@ modules:
         url: https://github.com/PCSX2/pcsx2/releases/download/v2.1.190/pcsx2-v2.1.190-linux-appimage-x64-Qt.AppImage
         sha256: 6a83a7bc499ad4ef4940aa2df08624876b452998f897ebdb8f8d7687c9035b79
 
+  - name: pcsx2-cheats
+    buildsystem: simple
+    build-commands:
+      - mkdir -p ${FLATPAK_DEST}/retrodeck/cheats
+      - tar -czf ${FLATPAK_DEST}/retrodeck/cheats/pcsx2.tar.gz cheats
+    sources:
+    - type: git
+      url: https://github.com/xs1l3n7x/pcsx2_cheats_collection
+      branch: main
+
   # Dolphin
   # why from source: AppImage not provided, only Flatpak
   # https://github.com/RetroDECK/org.DolphinEmu.dolphin-emu