diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4a53ae16099e78a0ac6040cf0b29a4de8f5b704d..8e96e359c06f4118f51f46140321e102497a7562 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,8 +15,6 @@ stages:
   image: registry.gitlab.e.foundation/e/os/docker-android-apps-cicd:chromium-latest
   rules:
     - if: $CI_PIPELINE_SOURCE != "schedule"
-  tags:
-    - build-browser
   before_script:
     - git submodule update --init --recursive build/cromite
     - $CI_PROJECT_DIR/update_cromite_patches.sh
@@ -30,24 +28,32 @@ stages:
 build-cromite-arm:
   stage: build
   extends: .build-cromite
+  tags:
+    - build-browser-arm
   script:
     - $CI_PROJECT_DIR/build.sh -c -s -a arm
 
 build-cromite-arm64:
   stage: build
   extends: .build-cromite
+  tags:
+    - build-browser-arm
   script:
     - $CI_PROJECT_DIR/build.sh -c -s -a arm64
 
 build-cromite-x86:
   stage: build
   extends: .build-cromite
+  tags:
+    - build-browser-x86
   script:
     - $CI_PROJECT_DIR/build.sh -c -s -a x86
 
 build-cromite-x64:
   stage: build
   extends: .build-cromite
+  tags:
+    - build-browser-x86
   script:
     - $CI_PROJECT_DIR/build.sh -c -s -a x64
 
diff --git a/build/browser.gn_args b/build/browser.gn_args
index 80fd3e3b97eb7f3b8ad7deab3ea472edb2361323..4c04156035c9b176d3110cd743a11067bff2bf8a 100644
--- a/build/browser.gn_args
+++ b/build/browser.gn_args
@@ -52,6 +52,7 @@ use_thin_lto=false
 use_v8_context_snapshot=false
 enable_glic = false
 build_tflite_with_xnnpack = false
+use_clang_modules = false
 
 chrome_public_manifest_package = "foundation.e.browser"
 system_webview_package_name="com.android.webview"
diff --git a/init-ccache.sh b/init-ccache.sh
index 28224fc8b7763a917a3e82fa0436578549cd7ccd..92ddfdbd79b16c02c8ca7a613278f4b94fbdb6c3 100755
--- a/init-ccache.sh
+++ b/init-ccache.sh
@@ -8,17 +8,20 @@ fi
 
 echo ">> [$(date)] Setting up ccache config"
 export PATH=$chromium_dir/src/third_party/llvm-build/Release+Asserts/bin:$PATH
-export CCACHE_DIR=$chromium_dir/.ccache
 export USE_CCACHE=1
 
 echo ">> [$(date)] Applying ccache configuration"
-ccache --set-config=max_size=200G \
+ccache --set-config=max_size=75G \
   --set-config=compression_level=6 \
+  --set-config=cache_dir="$chromium_dir/.ccache" \
+  --set-config=base_dir="$chromium_dir/src" \
+  --set-config=compiler_check=content \
+  --set-config=hash_dir=false \
+  --set-config=depend_mode=true \
   --set-config=sloppiness=time_macros
 
 echo ">> [$(date)] Cleaning unused cache files and statistics"
 ccache --evict-older-than 30d
-ccache -c
 ccache -z
 
 echo ">> [$(date)] Recompressing existing cache entries"