diff --git a/.github/workflows/linux-release-build.yml b/.github/workflows/linux-release-build.yml
index 169f5812e..5e5a32bff 100644
--- a/.github/workflows/linux-release-build.yml
+++ b/.github/workflows/linux-release-build.yml
@@ -83,12 +83,6 @@ jobs:
         run: |
           npm ci
 
-      - name: Install LLVM
-        run: |
-          wget https://apt.llvm.org/llvm.sh
-          chmod +x llvm.sh
-          sudo ./llvm.sh $(cat .llvm-version)
-
       - name: Load Surfer CI setup
         run: npm run surfer -- ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
 
diff --git a/.github/workflows/macos-release-build.yml b/.github/workflows/macos-release-build.yml
index 9d9d375ba..b3395f0f1 100644
--- a/.github/workflows/macos-release-build.yml
+++ b/.github/workflows/macos-release-build.yml
@@ -114,12 +114,6 @@ jobs:
         run: |
           npm ci
 
-      - name: Install LLVM
-        run: |
-          wget https://apt.llvm.org/llvm.sh
-          chmod +x llvm.sh
-          sudo ./llvm.sh $(cat .llvm-version)
-
       - name: Load surfer CI setup
         run: npm run surfer -- ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
 
diff --git a/.github/workflows/src/release-build.sh b/.github/workflows/src/release-build.sh
index 4cd0c1c7b..2b4feadb7 100644
--- a/.github/workflows/src/release-build.sh
+++ b/.github/workflows/src/release-build.sh
@@ -8,19 +8,26 @@ if command -v apt-get &> /dev/null; then
   sudo apt-get install -y xvfb libnvidia-egl-wayland1 mesa-utils libgl1-mesa-dri
 fi
 
-LLVM_VERSION=$(cat .llvm-version)
-if test -d "$HOME/.mozbuild/clang-$LLVM_VERSION/bin"; then
-    export CC="$HOME/.mozbuild/clang-$LLVM_VERSION/bin/clang"
-    export CXX="$HOME/.mozbuild/clang-$LLVM_VERSION/bin/clang++"
+if test -d "$HOME/.mozbuild/clang/bin"; then
+    export CC="$HOME/.mozbuild/clang/bin/clang"
+    export CXX="$HOME/.mozbuild/clang/bin/clang++"
 else
-    export CC=clang-$LLVM_VERSION
-    export CXX=clang-$LLVM_VERSION++
+    export CC=clang
+    export CXX=clang++
 fi
 
 mkdir -p ~/.zen-keys
-echo "$ZEN_SAFEBROWSING_API_KEY" > ~/.zen-keys/safebrowsing.dat
-echo "$ZEN_MOZILLA_API_KEY" > ~/.zen-keys/mozilla.dat
-echo "$ZEN_GOOGLE_LOCATION_SERVICE_API_KEY" > ~/.zen-keys/google_location_service.dat
+if test "$ZEN_SAFEBROWSING_API_KEY"; then
+  echo "$ZEN_SAFEBROWSING_API_KEY" > ~/.zen-keys/safebrowsing.dat
+fi
+
+if test "$ZEN_MOZILLA_API_KEY"; then
+  echo "$ZEN_MOZILLA_API_KEY" > ~/.zen-keys/mozilla.dat
+fi
+
+if test "$ZEN_GOOGLE_LOCATION_SERVICE_API_KEY"; then
+  echo "$ZEN_GOOGLE_LOCATION_SERVICE_API_KEY" > ~/.zen-keys/google_location_service.dat
+fi
 
 . $HOME/.cargo/env
 
diff --git a/.github/workflows/windows-release-build.yml b/.github/workflows/windows-release-build.yml
index e4972cac6..2f385cd30 100644
--- a/.github/workflows/windows-release-build.yml
+++ b/.github/workflows/windows-release-build.yml
@@ -87,12 +87,6 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y python3 python3-pip dos2unix yasm nasm build-essential libgtk2.0-dev libpython3-dev m4 uuid libasound2-dev libcurl4-openssl-dev libdbus-1-dev libdrm-dev libdbus-glib-1-dev libgtk-3-dev libpulse-dev libx11-xcb-dev libxt-dev xvfb lld llvm --fix-missing
 
-      - name: Install LLVM
-        run: |
-          wget https://apt.llvm.org/llvm.sh
-          chmod +x llvm.sh
-          sudo ./llvm.sh $(cat .llvm-version)
-
       - name: Load Surfer CI setup
         run: npm run surfer -- ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
 
diff --git a/.llvm-version b/.llvm-version
deleted file mode 100644
index 8fdd954df..000000000
--- a/.llvm-version
+++ /dev/null
@@ -1 +0,0 @@
-22
\ No newline at end of file
diff --git a/.rust-toolchain b/.rust-toolchain
index bfda7af0b..88310d7db 100644
--- a/.rust-toolchain
+++ b/.rust-toolchain
@@ -1 +1 @@
-1.95
\ No newline at end of file
+1.90
\ No newline at end of file