diff --git a/.github/workflows/linux-release-build.yml b/.github/workflows/linux-release-build.yml
index cc82e6e4e..8aeae6c55 100644
--- a/.github/workflows/linux-release-build.yml
+++ b/.github/workflows/linux-release-build.yml
@@ -17,7 +17,7 @@ jobs:
     permissions:
       contents: write
     # aarch64 does not need full 16x
-    runs-on: ${{ (inputs.release-branch == 'release' && matrix.arch == 'x86_64') && 'warp-ubuntu-latest-x64-16x' || 'ubuntu-latest' }}
+    runs-on: ${{ (inputs.release-branch == 'release' && matrix.arch == 'x86_64') && 'ubuntu-latest' || 'ubuntu-latest' }}
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/macos-release-build.yml b/.github/workflows/macos-release-build.yml
index 80c7863e1..8ee2d1eed 100644
--- a/.github/workflows/macos-release-build.yml
+++ b/.github/workflows/macos-release-build.yml
@@ -15,7 +15,7 @@ on:
 jobs:
   mac-build:
     name: Build macOS - ${{ matrix.arch }}
-    runs-on: ${{ inputs.release-branch == 'release' && 'warp-macos-14-arm64-6x' || 'macos-14' }}
+    runs-on: ${{ inputs.release-branch == 'release' && 'macos-14' || 'macos-14' }}
 
     strategy:
       fail-fast: false
diff --git a/.github/workflows/windows-profile-build.yml b/.github/workflows/windows-profile-build.yml
index d31f00031..97a18017c 100644
--- a/.github/workflows/windows-profile-build.yml
+++ b/.github/workflows/windows-profile-build.yml
@@ -25,7 +25,7 @@ jobs:
       matrix:
         arch: [x86_64, aarch64]
 
-    runs-on: ${{ inputs.release-branch == 'release' && 'warp-windows-latest-x64-8x' || 'windows-latest' }}
+    runs-on: ${{ inputs.release-branch == 'release' && 'windows-latest' || 'windows-latest' }}
 
     steps:
       - name: Checkout repository
diff --git a/.github/workflows/windows-release-build.yml b/.github/workflows/windows-release-build.yml
index 89086ee9f..b7d00dcf7 100644
--- a/.github/workflows/windows-release-build.yml
+++ b/.github/workflows/windows-release-build.yml
@@ -23,7 +23,7 @@ jobs:
   windows-build:
     name: Build Windows - ${{ matrix.arch }}
     # aarch64 does not need full 16x, and we also dont use full LTO when generating GPO
-    runs-on: ${{ (inputs.release-branch == 'release' && !inputs.generate-gpo && matrix.arch == 'x86_64') && 'warp-ubuntu-latest-x64-16x' || 'ubuntu-latest' }}
+    runs-on: ${{ (inputs.release-branch == 'release' && !inputs.generate-gpo && matrix.arch == 'x86_64') && 'ubuntu-latest' || 'ubuntu-latest' }}
 
     strategy:
       fail-fast: false
diff --git a/configs/common/mozconfig b/configs/common/mozconfig
index 83f5f361a..4500516eb 100644
--- a/configs/common/mozconfig
+++ b/configs/common/mozconfig
@@ -56,8 +56,9 @@ if test "$ZEN_RELEASE"; then
   if ! test "$ZEN_DISABLE_LTO"; then
     # only enable full LTO when ZEN_RELEASE_BRANCH is 'release'
     if test "$ZEN_RELEASE_BRANCH" = "release"; then
-      export MOZ_LTO=cross,full
-      ac_add_options --enable-lto=cross,full
+      # TODO: make it "full" once we have the resources to build it
+      export MOZ_LTO=cross,thin
+      ac_add_options --enable-lto=cross,thin
     else
       export MOZ_LTO=cross,thin
       ac_add_options --enable-lto=cross,thin
diff --git a/configs/macos/mozconfig b/configs/macos/mozconfig
index 2d36fe246..7528354cf 100644
--- a/configs/macos/mozconfig
+++ b/configs/macos/mozconfig
@@ -6,10 +6,6 @@ ac_add_options --enable-eme=widevine
 export MOZ_MACBUNDLE_ID=${appId}
 export MOZ_MACBUNDLE_NAME="Zen Browser.app"
 
-# override LTO settings, for now...
-export MOZ_LTO=cross,thin
-ac_add_options --enable-lto=cross,thin
-
 if test "$ZEN_RELEASE"; then
   if test "$ZEN_GA_DISABLE_PGO"; then
     export ZEN_DUMMY=1