diff --git a/data/manifest.yaml b/data/manifest.yaml
index c1a9be78..1b0d21fe 100644
--- a/data/manifest.yaml
+++ b/data/manifest.yaml
@@ -34105,6 +34105,7 @@ An Egg Can Dream:
     id: 1139100
 "An Elder Scrolls Legend: Battlespire":
   cloud:
+    gog: true
     steam: true
   files:
     "<base>/MSS/DIG.INI":
@@ -64492,8 +64493,6 @@ Battle Islands:
   steam:
     id: 445720
 Battle Isle:
-  cloud:
-    gog: true
   gog:
     id: 1207660993
   id:
@@ -64501,8 +64500,6 @@ Battle Isle:
       - 1207658917
     lutris: battle-isle
 Battle Isle 2:
-  cloud:
-    gog: true
   files:
     "<base>/SAV":
       tags:
@@ -64516,8 +64513,6 @@ Battle Isle 2:
       - 1207658917
     lutris: battle-isle-2
 Battle Isle 3:
-  cloud:
-    gog: true
   files:
     "<base>/SDI/SAV":
       tags:
@@ -255389,8 +255384,6 @@ FreeHolder:
   steam:
     id: 463800
 FreeSpace 2:
-  cloud:
-    gog: true
   files:
     "<base>/data/players":
       tags:
@@ -328400,8 +328393,6 @@ Incremental Epic Hero 2:
   steam:
     id: 1690710
 "Incubation: Time Is Running Out":
-  cloud:
-    gog: true
   files:
     "<base>/DATA":
       tags:
@@ -362084,6 +362075,8 @@ Lands of Lore III:
       - 1207658980
     lutris: lands-of-lore-guardians-of-desitny
 "Lands of Lore: The Throne of Chaos":
+  cloud:
+    gog: true
   files:
     "<base>/_SAVE*.DAT":
       tags:
@@ -398486,7 +398479,6 @@ Master of LinCard:
     id: 1138030
 Master of Magic:
   cloud:
-    gog: true
     steam: true
   files:
     "<base>/MAGIC.SET":
@@ -407389,6 +407381,7 @@ Metro 2033:
     id: 43110
 Metro 2033 Redux:
   cloud:
+    gog: true
     steam: true
   files:
     "<base>/<storeUserId>/user.cfg":
@@ -407738,6 +407731,7 @@ Metro Warp:
 "Metro: Last Light Redux":
   cloud:
     epic: true
+    gog: true
     steam: true
   files:
     "<base>/<storeUserId>/user.cfg":
@@ -474351,8 +474345,6 @@ Pato Box:
   steam:
     id: 682080
 "Patrician II: Quest for Power":
-  cloud:
-    gog: true
   files:
     "<base>/P2.cfg":
       tags:
@@ -659686,7 +659678,6 @@ The Eigengrau Menagerie:
 "The Elder Scrolls III: Morrowind":
   cloud:
     epic: true
-    gog: true
     steam: true
   files:
     "<base>/Morrowind.ini":
@@ -721745,7 +721736,6 @@ Ultima Online:
     lutris: ultima-vi
 "Ultima VII Part Two: Serpent Isle":
   cloud:
-    gog: true
     origin: true
   files:
     "<base>/GAME*.U7":
diff --git a/data/wiki-game-cache.yaml b/data/wiki-game-cache.yaml
index 967095fa..657e4570 100644
--- a/data/wiki-game-cache.yaml
+++ b/data/wiki-game-cache.yaml
@@ -10657,6 +10657,7 @@ An Egg Can Dream:
   steam: 1139100
 "An Elder Scrolls Legend: Battlespire":
   cloud:
+    gog: true
     steam: true
   gog: 1440163341
   gogSide:
@@ -20339,16 +20340,12 @@ Battle Islands:
   pageId: 52590
   steam: 445720
 Battle Isle:
-  cloud:
-    gog: true
   gog: 1207660993
   gogSide:
     - 1207658917
   lutris: battle-isle
   pageId: 13649
 Battle Isle 2:
-  cloud:
-    gog: true
   gog: 1207661073
   gogSide:
     - 1207658917
@@ -20358,8 +20355,6 @@ Battle Isle 2:
     - "{{Game data/config|DOS|{{p|game}}\\}}"
     - "{{Game data/saves|DOS|{{p|game}}\\SAV}}"
 Battle Isle 3:
-  cloud:
-    gog: true
   gog: 1207661103
   gogSide:
     - 1207658917
@@ -80907,8 +80902,6 @@ FreeHolder:
 FreeOrion:
   pageId: 171450
 FreeSpace 2:
-  cloud:
-    gog: true
   gog: 5
   lutris: freespace-2
   pageId: 997
@@ -104133,8 +104126,6 @@ Incremental Epic Hero 2:
     - "{{Game data/saves|Windows|{{p|appdata}}\\LocalLow\\HapiwakuProject\\Incremental Epic Hero 2}}"
     - "{{Game data/saves|OS X|{{p|osxhome}}/Library/Application Support/HapiwakuProject/Incremental Epic Hero 2}}"
 "Incubation: Time Is Running Out":
-  cloud:
-    gog: true
   gog: 1207661123
   gogSide:
     - 1207658917
@@ -114949,6 +114940,8 @@ Lands of Lore III:
     - "{{Game data/config|Windows|{{p|game}}\\}}"
     - "{{Game data/saves|Windows|{{p|game}}\\SAVEGAME}}"
 "Lands of Lore: The Throne of Chaos":
+  cloud:
+    gog: true
   gog: 1207662513
   gogSide:
     - 1207658980
@@ -126491,7 +126484,6 @@ Master of LinCard:
   steam: 1138030
 Master of Magic:
   cloud:
-    gog: true
     steam: true
   gog: 1207658855
   gogSide:
@@ -129385,6 +129377,7 @@ Metro 2033:
 Metro 2033 Redux:
   cloud:
     discord: true
+    gog: true
     steam: true
     xbox: true
   gog: 1436434037
@@ -129503,6 +129496,7 @@ Metro Warp:
   cloud:
     discord: true
     epic: true
+    gog: true
     steam: true
     xbox: true
   gog: 1430740172
@@ -151095,8 +151089,6 @@ Pato Box:
   pageId: 81105
   steam: 682080
 "Patrician II: Quest for Power":
-  cloud:
-    gog: true
   gog: 1207663933
   gogSide:
     - 1207658802
@@ -209552,7 +209544,6 @@ The Eigengrau Menagerie:
 "The Elder Scrolls III: Morrowind":
   cloud:
     epic: true
-    gog: true
     steam: true
   gog: 1440163901
   gogSide:
@@ -230298,7 +230289,6 @@ Ultima Online:
     - "{{Game data/saves|DOS|{{p|game}}\\SAVEGAME\\}}"
 "Ultima VII Part Two: Serpent Isle":
   cloud:
-    gog: true
     origin: true
   gog: 1207662633
   pageId: 14063