diff --git a/data/manifest.yaml b/data/manifest.yaml
index 6062092f..ae60d011 100644
--- a/data/manifest.yaml
+++ b/data/manifest.yaml
@@ -152,6 +152,16 @@ $1 Ride:
   cloud:
     steam: true
   files:
+    "<base>/options.ron":
+      tags:
+        - config
+      when:
+        - store: steam
+    "<base>/saves":
+      tags:
+        - config
+      when:
+        - store: steam
     "<winAppData>/Gnorp/Apologue/Saves":
       tags:
         - save
@@ -754751,6 +754761,18 @@ Warhalla:
       when:
         - os: windows
           store: steam
+  id:
+    steamExtra:
+      - 2486150
+      - 2792140
+      - 2792150
+      - 2792170
+      - 2792280
+      - 3202690
+      - 3212020
+      - 3212040
+      - 3274400
+      - 3274410
   installDir:
     Space Marine 2: {}
   launch:
diff --git a/data/steam-game-cache.yaml b/data/steam-game-cache.yaml
index 60294b3e..73341185 100644
--- a/data/steam-game-cache.yaml
+++ b/data/steam-game-cache.yaml
@@ -587650,7 +587650,7 @@
       executable: Warhammer 40000 Space Marine 2.exe
       workingdir: "client_pc\\root\\bin\\pc"
     - config:
-        betakey: "focus_marketing_recording, focus_playtest, ms_builds, fe_hw_nvidia_temp"
+        betakey: "focus_marketing_recording, focus_playtest, ms_builds, fe_hw_nvidia_temp, test_pvp"
         oslist: windows
       description: Profile Launcher
       executable: launcher_pc_profile.bat
@@ -587724,12 +587724,12 @@
       type: option3
       workingdir: "client_pc\\root\\bin\\pc"
     - config:
-        betakey: "focus_marketing_recording, focus_playtest, ms_builds, fe_hw_nvidia_temp"
+        betakey: "focus_marketing_recording, focus_playtest, ms_builds, fe_hw_nvidia_temp, test_pvp"
         oslist: windows
       description: Release Launcher
       executable: launcher_pc_release.bat
     - config:
-        betakey: "focus_marketing_recording, focus_playtest, ms_builds, fe_hw_nvidia_temp"
+        betakey: "focus_marketing_recording, focus_playtest, ms_builds, fe_hw_nvidia_temp, test_pvp"
         oslist: windows
       description: Retail Launcher
       executable: launcher_pc_retail.bat
@@ -592934,6 +592934,28 @@
     koreana: 소드 아트 온라인 인테그럴 팩터
     tchinese: 刀劍神域 關鍵鬥士
 2373630:
+  cloud:
+    saves:
+      - path: data
+        pattern: "*"
+        recursive: true
+        root: gameinstall
+    overrides:
+      - addPath: moonring/
+        os: Windows
+        osCompare: "="
+        root: gameinstall
+        useInstead: WinAppDataRoaming
+      - addPath: Moonring/
+        os: MacOS
+        osCompare: "="
+        root: gameinstall
+        useInstead: MacAppSupport
+      - addPath: Moonring/
+        os: Linux
+        osCompare: "="
+        root: gameinstall
+        useInstead: LinuxXdgDataHome
   installDir: Moonring
   launch:
     - config:
diff --git a/data/wiki-game-cache.yaml b/data/wiki-game-cache.yaml
index a512524a..4101b602 100644
--- a/data/wiki-game-cache.yaml
+++ b/data/wiki-game-cache.yaml
@@ -69,7 +69,9 @@ $1 Ride:
   steam: 1473350
   templates:
     - "{{Game data/config|Windows|{{p|appdata}}\\Gnorp\\Apologue\\options.ron}}"
+    - "{{Game data/config|Steam|{{p|game}}\\options.ron}}"
     - "{{Game data/saves|Windows|{{p|appdata}}\\Gnorp\\Apologue\\Saves\\*}}"
+    - "{{Game data/config|Steam|{{p|game}}\\saves\\*}}"
 "***":
   pageId: 129579
   steam: 1034230
@@ -242289,6 +242291,17 @@ Warhalla:
   renamedFrom:
     - "Warhammer 40,000: Space Marine 2"
   steam: 2183900
+  steamSide:
+    - 2486150
+    - 2792140
+    - 2792150
+    - 2792170
+    - 2792280
+    - 3202690
+    - 3212020
+    - 3212040
+    - 3274400
+    - 3274410
   templates:
     - "{{Game data/config|Steam|{{P|localappdata}}\\Saber\\Space Marine 2\\storage\\steam\\user\\{{p|uid}}\\Main\\config\\}}"
     - "{{Game data/saves|Steam|{{P|localappdata}}\\Saber\\Space Marine 2\\storage\\steam\\user\\{{p|uid}}\\Main\\config\\}}"