diff --git a/data/manifest.yaml b/data/manifest.yaml
index 599b8f1f..abf711cd 100644
--- a/data/manifest.yaml
+++ b/data/manifest.yaml
@@ -386506,12 +386506,13 @@ One Piece Odyssey:
     id: 331600
 "One Piece: Pirate Warriors 4":
   files:
-    "<winLocalAppData>/BANDAI NAMCO Entertainment/One Piece Pirate Warriors 4/Saved/SaveGames":
+    "<winLocalAppData>/BANDAI NAMCO Entertainment/One Piece Pirate Warriors 4/Saved/SaveGames/<storeUserId>":
       tags:
         - config
         - save
       when:
         - os: windows
+          store: steam
     "<winLocalAppData>/Packages/NAMCOBANDAIGamesInc.ONEPIECEPIRATEWARRIORS4Windows_gdy2aq6ez762w/SystemAppData/wgs":
       tags:
         - save
@@ -386527,9 +386528,11 @@ One Piece Odyssey:
             os: windows
             store: steam
   registry:
-    HKEY_CURRENT_USER/Software/BNE/OPPW4:
+    HKEY_CURRENT_USER/Software/BNE/OPPW4/<storeUserId>/System:
       tags:
         - config
+      when:
+        - store: steam
     HKEY_CURRENT_USER/Software/BNE/OPPW4/Microsoft Store/System:
       tags:
         - config
diff --git a/data/steam-game-cache.yaml b/data/steam-game-cache.yaml
index c87c9213..157e51b4 100644
--- a/data/steam-game-cache.yaml
+++ b/data/steam-game-cache.yaml
@@ -851,6 +851,13 @@
     - arguments: "-steam"
       executable: mm.exe
 2200:
+  cloud:
+    saves:
+      - path: baseq3
+        pattern: q3config.cfg
+        platforms:
+          - all
+        root: gameinstall
   installDir: Quake 3 Arena
   launch:
     - executable: quake3.exe
@@ -861,12 +868,30 @@
       description: Default
       executable: Quake4.exe
 2270:
+  cloud:
+    saves:
+      - path: base
+        pattern: SAVEGAM*.WL6
+        root: gameinstall
+      - path: base/m1
+        pattern: SAVEGAM*.SOD
+        root: gameinstall
   installDir: Wolfenstein 3D
   launch:
     - description: Wolfenstein 3D
       executable: "dosbox\\launcher.exe"
       type: default
 2280:
+  cloud:
+    saves:
+      - path: base
+        pattern: "*.DSG"
+        platforms:
+          - all
+        root: gameinstall
+      - path: id Software/DOOM Classic
+        pattern: "*.dat"
+        root: WinSavedGames
   installDir: Ultimate Doom
   launch:
     - config:
@@ -882,6 +907,13 @@
       executable: "base\\dosbox.exe"
       type: none
 2290:
+  cloud:
+    saves:
+      - path: base
+        pattern: "*.DSG"
+        platforms:
+          - all
+        root: gameinstall
   installDir: Final Doom
   launch:
     - arguments: "-conf .\\base\\plutoniam.conf -fullscreen -exit"
@@ -896,6 +928,16 @@
       description: "Launch Final Doom: TNT Evilution with classic controls"
       executable: "base\\dosbox.exe"
 2300:
+  cloud:
+    saves:
+      - path: base
+        pattern: "*.DSG"
+        platforms:
+          - all
+        root: gameinstall
+      - path: id Software/DOOM 2
+        pattern: "*.dat"
+        root: WinSavedGames
   installDir: Doom 2
   launch:
     - config:
@@ -911,6 +953,22 @@
     - description: Launch Master Levels (Original)
       executable: master.bat
 2310:
+  cloud:
+    saves:
+      - path: Id1
+        pattern: "*.sav"
+        platforms:
+          - all
+        root: gameinstall
+      - path: Id1
+        pattern: config.cfg
+        platforms:
+          - all
+        root: gameinstall
+      - path: Nightdive Studios/Quake
+        pattern: "*.sav"
+        recursive: true
+        root: WinSavedGames
   installDir: Quake
   launch:
     - executable: rerelease/Quake_x64_steam.exe
@@ -927,6 +985,103 @@
       executable: glquake.exe
       type: option1
 2320:
+  cloud:
+    saves:
+      - path: baseq2/save/current
+        pattern: "*"
+        platforms:
+          - all
+        root: gameinstall
+      - path: baseq2/save/save8
+        pattern: "*"
+        platforms:
+          - all
+        root: gameinstall
+      - path: baseq2/save/save9
+        pattern: "*"
+        platforms:
+          - all
+        root: gameinstall
+      - path: baseq2/save/save10
+        pattern: "*"
+        platforms:
+          - all
+        root: gameinstall
+      - path: baseq2/save/save11
+        pattern: "*"
+        platforms:
+          - all
+        root: gameinstall
+      - path: baseq2/save/save12
+        pattern: "*"
+        platforms:
+          - all
+        root: gameinstall
+      - path: baseq2/save/save13
+        pattern: "*"
+        platforms:
+          - all
+        root: gameinstall
+      - path: baseq2/save/save14
+        pattern: "*"
+        platforms:
+          - all
+        root: gameinstall
+      - path: baseq2
+        pattern: config.cfg
+        platforms:
+          - all
+        root: gameinstall
+      - path: Nightdive Studios/Quake II/baseq2/save
+        pattern: "*.pak.gz"
+        recursive: true
+        root: WinSavedGames
+      - path: Nightdive Studios/Quake II/
+        pattern: system.cfg
+        root: WinSavedGames
+      - path: baseq2/save/save0
+        pattern: "*"
+        platforms:
+          - all
+        root: gameinstall
+      - path: Nightdive Studios/Quake II/baseq2
+        pattern: "*.cfg"
+        root: WinSavedGames
+      - path: baseq2/save/save1
+        pattern: "*"
+        platforms:
+          - all
+        root: gameinstall
+      - path: baseq2/save/save2
+        pattern: "*"
+        platforms:
+          - all
+        root: gameinstall
+      - path: baseq2/save/save3
+        pattern: "*"
+        platforms:
+          - all
+        root: gameinstall
+      - path: baseq2/save/save4
+        pattern: "*"
+        platforms:
+          - all
+        root: gameinstall
+      - path: baseq2/save/save5
+        pattern: "*"
+        platforms:
+          - all
+        root: gameinstall
+      - path: baseq2/save/save6
+        pattern: "*"
+        platforms:
+          - all
+        root: gameinstall
+      - path: baseq2/save/save7
+        pattern: "*"
+        platforms:
+          - all
+        root: gameinstall
   installDir: Quake 2
   launch:
     - executable: rerelease/quake2ex_steam.exe
@@ -2877,12 +3032,41 @@
       description: "Launch Mission 3: Ultimate Challenge"
       executable: "base\\\\dosbox.exe"
 9010:
+  cloud:
+    saves:
+      - path: Main/save
+        pattern: "*.svg"
+        platforms:
+          - all
+        root: gameinstall
+      - path: Main/save/autosave
+        pattern: "*.svg"
+        platforms:
+          - all
+        root: gameinstall
   installDir: Return to Castle Wolfenstein
   launch:
     - executable: WolfSP.exe
     - description: Launch Return to Castle Wolfenstein Multiplayer
       executable: WolfMP.exe
 9050:
+  cloud:
+    saves:
+      - path: base/savegames
+        pattern: "*.txt"
+        platforms:
+          - all
+        root: gameinstall
+      - path: base/savegames
+        pattern: "*.save"
+        platforms:
+          - all
+        root: gameinstall
+      - path: base/savegames
+        pattern: "*.tga"
+        platforms:
+          - all
+        root: gameinstall
   installDir: Doom 3
   launch:
     - executable: Doom3.exe
@@ -444015,6 +444199,14 @@
     turkish: Command & Conquer™ Generals 
     ukrainian: Command & Conquer™ Generals 
 2229880:
+  cloud:
+    saves:
+      - path: ""
+        pattern: "*.SAV"
+        platforms:
+          - Windows
+        recursive: true
+        root: gameinstall
   installDir: Command & Conquer Tiberian Sun
   launch:
     - description: Command & Conquer™ Tiberian Sun™
diff --git a/data/wiki-game-cache.yaml b/data/wiki-game-cache.yaml
index 0a22fdbc..97523fbc 100644
--- a/data/wiki-game-cache.yaml
+++ b/data/wiki-game-cache.yaml
@@ -116312,9 +116312,9 @@ One Piece Odyssey:
   pageId: 143733
   steam: 1089090
   templates:
-    - "{{Game data/config|Windows|{{p|localappdata}}\\BANDAI NAMCO Entertainment\\One Piece Pirate Warriors 4\\Saved\\SaveGames\\|{{p|hkcu}}\\Software\\BNE\\OPPW4\\}}"
+    - "{{Game data/config|Steam|{{p|localappdata}}\\BANDAI NAMCO Entertainment\\One Piece Pirate Warriors 4\\Saved\\SaveGames\\{{P|uid}}|{{p|hkcu}}\\Software\\BNE\\OPPW4\\{{P|uid}}\\System}}"
     - "{{Game data/config|Microsoft Store|{{p|hkcu}}\\Software\\BNE\\OPPW4\\Microsoft Store\\System}}"
-    - "{{Game data/saves|Windows|{{p|localappdata}}\\BANDAI NAMCO Entertainment\\One Piece Pirate Warriors 4\\Saved\\SaveGames\\}}"
+    - "{{Game data/saves|Steam|{{p|localappdata}}\\BANDAI NAMCO Entertainment\\One Piece Pirate Warriors 4\\Saved\\SaveGames\\{{P|uid}}}}"
     - "{{Game data/saves|Microsoft Store|{{P|localappdata}}\\Packages\\NAMCOBANDAIGamesInc.ONEPIECEPIRATEWARRIORS4Windows_gdy2aq6ez762w\\SystemAppData\\wgs}}"
 "One Piece: Unlimited World Red Deluxe Edition":
   pageId: 62458