diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml
index 5c5bb7ac8..136475cd4 100644
--- a/.github/workflows/alpha.yml
+++ b/.github/workflows/alpha.yml
@@ -580,25 +580,20 @@ jobs:
       - name: List
         run: find .
 
-      - name: Checkout tools repo
-        uses: actions/checkout@v3
-        with:
-          repository: zen-browser/desktop
-          path: updates
-          token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Pull tools repo
-        run: git pull && git checkout main
+      - name: Clone updates repo
+        run: git clone https://github.com/zen-browser/updates-server.git
 
       - name: Copy update manifests
         run: |
-          mkdir -p updates/updates
-          cp -a linux_update_manifest/. updates/updates/
-          cp -a windows_update_manifest/. updates/updates/
+          cd updates-server
+          mkdir -p updates
+          cp -a ../linux_update_manifest/. updates/
+          cp -a ../windows_update_manifest/. updates/
 
       - uses: stefanzweifel/git-auto-commit-action@v4
         with:
           commit_message: 🔖 Upload update manifests ${{ needs.build-data.outputs.version }}
           commit_user_name: Zen Browser Robot
           commit_user_email: zen-browser-bot@users.noreply.github.com
-          repository: ./updates
+          repository: ./updates-server
+
diff --git a/configs/common/mozconfig b/configs/common/mozconfig
index 4ab4f076c..1c61a2be3 100644
--- a/configs/common/mozconfig
+++ b/configs/common/mozconfig
@@ -1,6 +1,5 @@
 # Browser branding
 ac_add_options --enable-update-channel=release
-ac_add_options --with-ccache=sccache
 ac_add_options --without-wasm-sandboxed-libraries
 
 # ac_add_options --with-branding=beta
@@ -28,5 +27,14 @@ export MOZ_SOURCE_CHANGESET=${changeset}
 
 ac_add_options --enable-bootstrap
 
+ac_add_options --enable-application=browser
+ac_add_options --enable-hardening
+ac_add_options --enable-rust-simd
+ac_add_options --enable-release
+ac_add_options --enable-optimize
+ac_add_options --with-ccache=sccache
+ac_add_options --disable-debug
+ac_add_options --enable-updater
+
 # ALWAYS MANTAIN ONE LINE BREAK AT THE END OF THIS FILE
 
diff --git a/configs/linux/mozconfig b/configs/linux/mozconfig
index 2e4087543..4105cacc6 100644
--- a/configs/linux/mozconfig
+++ b/configs/linux/mozconfig
@@ -1,12 +1,12 @@
 # Optimise builds
-ac_add_options --enable-application=browser
-ac_add_options --enable-hardening
-ac_add_options --enable-rust-simd
-ac_add_options --enable-release
-ac_add_options --enable-optimize
-ac_add_options --with-ccache=sccache
-ac_add_options --disable-debug
-ac_add_options --enable-updater
+# ac_add_options --enable-application=browser
+# ac_add_options --enable-hardening
+# ac_add_options --enable-rust-simd
+# ac_add_options --enable-release
+# ac_add_options --enable-optimize
+# ac_add_options --with-ccache=sccache
+# ac_add_options --disable-debug
+# ac_add_options --enable-updater
 
 # Disable telemetry and tracking
 mk_add_options MOZ_TELEMETRY_REPORTING=
diff --git a/gluon.json b/gluon.json
index 550cefdb9..4e8659c9c 100644
--- a/gluon.json
+++ b/gluon.json
@@ -5,12 +5,10 @@
   "binaryName": "zen",
   "version": {
     "product": "firefox",
-    "version": "127.0.2",
-    "displayVersion": "1.0.0"
+    "version": "127.0.2"
   },
   "buildOptions": {
-    "generateBranding": true,
-    "windowsUseSymbolicLinks": false
+    "generateBranding": true
   },
   "addons": {},
   "brands": {
@@ -46,5 +44,6 @@
       ".*\\.json"
     ],
     "licenseType": "MPL-2.0"
-  }
+  },
+  "updateHostname": "zen-updates.vercel.app"
 }
\ No newline at end of file
diff --git a/src/browser/components/zen-welcome/welcome.css b/src/browser/components/zen-welcome/welcome.css
index 8b015b611..205bceed9 100644
--- a/src/browser/components/zen-welcome/welcome.css
+++ b/src/browser/components/zen-welcome/welcome.css
@@ -51,6 +51,11 @@ button {
   text-align: center;
 }
 
+#theme .card[disabled="true"] {
+  opacity: 0.7;
+  cursor: not-allowed;
+}
+
 .cardGroup {
   display: flex;
   flex-wrap: wrap;
diff --git a/src/browser/components/zen-welcome/welcome.js b/src/browser/components/zen-welcome/welcome.js
index 48ea273dc..8ff6097a2 100644
--- a/src/browser/components/zen-welcome/welcome.js
+++ b/src/browser/components/zen-welcome/welcome.js
@@ -134,11 +134,18 @@ class Themes extends Page {
       container.classList.add('card');
       container.classList.add('card-no-hover');
 
+      if (theme.id == "firefox-compact-dream@mozilla.org" || theme.id == "firefox-compact-galaxy@mozilla.org") {
+        container.setAttribute('disabled', 'true')
+      }
+
       if (theme.isActive) {
         container.classList.add('selected')
       }
 
       container.addEventListener('click', () => {
+        if (container.hasAttribute('disabled')) {
+          return
+        }
         document.body.classList.add('normal-background');
         themeElements.forEach((el) => el.classList.remove('selected'))
         container.classList.add('selected')
diff --git a/src/gfx/wr/webrender/src/util-rs.patch b/src/gfx/wr/webrender/src/util-rs.patch
new file mode 100644
index 000000000..21ac4b1fb
--- /dev/null
+++ b/src/gfx/wr/webrender/src/util-rs.patch
@@ -0,0 +1,15 @@
+diff --git a/gfx/wr/webrender/src/util.rs b/gfx/wr/webrender/src/util.rs
+index fa02d87b91c961c08da1a03357f514c71e508476..1d5ca171b7ac5c4369299a1623021279fd8801ad 100644
+--- a/gfx/wr/webrender/src/util.rs
++++ b/gfx/wr/webrender/src/util.rs
+@@ -164,7 +164,9 @@ impl ScaleOffset {
+            m.m34.abs() > NEARLY_ZERO ||
+            m.m43.abs() > NEARLY_ZERO ||
+            (m.m44 - 1.0).abs() > NEARLY_ZERO {
+-            return None;
++            // Ignore this error, this change fixes the bug that crashes when opening an extension popup
++            printf("zen bug: Not a pure scale / translation");
++            //return None;
+         }
+ 
+         Some(ScaleOffset {