diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3b8541c4fc6801bc6c399cba9b69b25c714d0cf5..07b721858c95cace0cdb0c67b08d9829386a174b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,9 @@
+image: registry.gitlab.e.foundation/e/os/docker-android-apps-cicd:latest
+
 stages:
   - auto-merge-main
   - update-from-upstream
+  - build
 
 include:
   - project: 'e/templates'
@@ -10,8 +13,32 @@ include:
     ref: master
     file: '/gitlab-ci/.gitlab-ci-import-updates-from-upstream.yml'
 
-main:
+auto_merge_main:
+  extends: .auto-merge-main
+  variables:
+    BRANCH_NAME_REGEX: /^v[0-9](\.[0-9]*){1,2}$/
+    TARGET_BRANCH: main
+
+upstream_main:
   extends: .update-from-upstream
   variables:
     UPSTREAM_BRANCH: lineage-23.2
     LOCAL_BRANCH: main
+
+before_script:
+  - export GRADLE_USER_HOME="$CI_PROJECT_DIR/.gradle"
+  - chmod +x ./gradlew
+
+cache:
+  key: ${CI_PROJECT_ID}
+  paths:
+    - .gradle/
+
+build:
+  stage: build
+  script:
+    - ./gradlew assembleDebug
+  artifacts:
+    when: always
+    paths:
+      - build/outputs/apk/debug
diff --git a/common/Android.bp b/common/Android.bp
index f3f7a0e3c2d42bccc2176264875711317c96a32f..e2979b583147844cb577bd754981e6037de84fa4 100644
--- a/common/Android.bp
+++ b/common/Android.bp
@@ -26,5 +26,5 @@ java_library {
     host_supported: true,
     srcs: ["src/**/*.java"],
     static_libs: ["jsr305"],
-    sdk_version: "34",
+    sdk_version: "current",
 }
diff --git a/java/Android.bp b/java/Android.bp
index 895ac1cfa171e9fce7f327604cb14e4c6f5c5f2a..3241292614cc5c75115d283bed1a71e8c221365e 100644
--- a/java/Android.bp
+++ b/java/Android.bp
@@ -58,7 +58,7 @@ android_app {
 
     min_sdk_version: "30",
     target_sdk_version: "34",
-    sdk_version: "35",
+    sdk_version: "current",
 
     product_specific: true,
 
diff --git a/java/src/com/android/inputmethod/latin/utils/ResourceUtils.java b/java/src/com/android/inputmethod/latin/utils/ResourceUtils.java
index 62810dcb611b14011dce8ed6b3023cf6336584a5..6763d693926d5c545593c639900330acfae3e25b 100644
--- a/java/src/com/android/inputmethod/latin/utils/ResourceUtils.java
+++ b/java/src/com/android/inputmethod/latin/utils/ResourceUtils.java
@@ -188,7 +188,7 @@ public final class ResourceUtils {
     }
 
     public static int getDefaultKeyboardWidth(final Context context) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
+        if (Build.VERSION.SDK_INT >= 35) { // Build.VERSION_CODES.VANILLA_ICE_CREAM
             // Since Android 15’s edge-to-edge enforcement, window insets should be considered.
             final WindowManager wm = context.getSystemService(WindowManager.class);
             final WindowMetrics windowMetrics = wm.getCurrentWindowMetrics();