diff --git a/src/commands/patches/branding-patch.ts b/src/commands/patches/branding-patch.ts
index 2640a68..ca8c621 100644
--- a/src/commands/patches/branding-patch.ts
+++ b/src/commands/patches/branding-patch.ts
@@ -422,8 +422,37 @@ pref("devtools.selfxss.count", 5);
 }
 
 function setUpdateURLs() {
-  const sufix =
-    compatMode && (process as any).surferPlatform !== 'macos' ? '-generic' : ''
+  let suffix;
+  if ((process as any).surferPlatform == 'win32') {
+    if (compatMode == 'x86_64') {
+      suffix = '-generic';
+    }
+    else if (compatMode == 'x86_64-v3') {
+      suffix = '';
+    }
+    else if (compatMode == 'aarch64') {
+      suffix = '-aarch64';
+    }
+  }
+  if ((process as any).surferPlatform == 'linux') {
+    if (compatMode == 'x86_64') {
+      suffix = '-generic';
+    }
+    else if (compatMode == 'aarch64') {
+      suffix = '';
+    }
+  }
+  if ((process as any).surferPlatform == 'linux') {
+    if (compatMode == 'x86_64') {
+      suffix = '-generic';
+    }
+    else if (compatMode == 'x86_64-v3') {
+      suffix = '';
+    }
+    else if (compatMode == 'aarch64') {
+      suffix = '-aarch64';
+    }
+  }
   const baseURL = `URL=https://@MOZ_APPUPDATE_HOST@/updates/browser/%BUILD_TARGET%/%CHANNEL%${sufix}/update.xml`
   const appIni = join(ENGINE_DIR, 'build', 'application.ini.in')
   const appIniContents = readFileSync(appIni).toString()