diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 51503631100de567d1a13be1440fa64550304a6f..5e70db8bd3dabb81ff4332d4125b7adf426039ee 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,11 +1,33 @@
+image: "registry.gitlab.e.foundation/e/os/docker-android-apps-cicd:latest"
+
 stages:
-  - auto-merge-main
+  - build
   - update-from-upstream
 
 include:
-  - project: 'e/templates'
-    ref: master
-    file: '/gitlab-ci/.gitlab-ci-auto-merge-main.yml'
-  - project: 'e/templates'
-    ref: master
-    file: '/gitlab-ci/.gitlab-ci-import-updates-from-upstream.yml'
+  - project: "e/templates"
+    ref: main
+    file: "/.gitlab/gitlab-ci/gitlab-ci-import-updates-from-upstream.yml"
+
+main:
+  extends: .update-from-upstream
+  variables:
+    UPSTREAM_BRANCH: lineage-23.2
+    LOCAL_BRANCH: main
+
+before_script:
+  - export GRADLE_USER_HOME=$(pwd)/.gradle
+  - chmod +x ./gradlew
+
+cache:
+  key: ${CI_PROJECT_ID}
+  paths:
+    - .gradle/
+
+build:
+  stage: build
+  script:
+    - ./gradlew assemble
+  artifacts:
+    paths:
+      - build/outputs/apk
diff --git a/build.gradle.kts b/build.gradle.kts
index 32aa68fc7535307379672b65899b288756bfb0d4..104749cb2836bbecffae2821617695b23074102e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -24,11 +24,22 @@ android {
         versionName = "1.0"
     }
 
+    signingConfigs {
+        create("testkey") {
+            storeFile = File("${rootDir}/keystore/testkey.jks")
+            storePassword = "testkey"
+            keyAlias = "testkey"
+            keyPassword = "testkey"
+        }
+    }
+
     buildTypes {
         getByName("release") {
             // Enables code shrinking, obfuscation, and optimization.
             isMinifyEnabled = true
 
+            signingConfig = signingConfigs.getByName("testkey")
+
             // Enables resource shrinking.
             isShrinkResources = true
 
@@ -41,8 +52,7 @@ android {
             )
         }
         getByName("debug") {
-            // Append .dev to package name so we won't conflict with AOSP build.
-            applicationIdSuffix = ".dev"
+            signingConfig = signingConfigs.getByName("testkey")
         }
     }
     compileOptions {
@@ -64,6 +74,8 @@ dependencies {
     implementation("androidx.webkit:webkit:1.7.0-alpha02")
     implementation("com.google.android.material:material:1.11.0")
     implementation("com.hp:crcalc:1.0")
+
+    implementation("foundation.e:elib:0.0.1-alpha11")
 }
 
 configure<GenerateBpPluginExtension> {
diff --git a/keystore/testkey.jks b/keystore/testkey.jks
new file mode 100644
index 0000000000000000000000000000000000000000..f8e2054d1569c252e29ec38ddf557234164c2534
Binary files /dev/null and b/keystore/testkey.jks differ
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 6aa902c15bc1d39545dc0d7b9e3f81a032615d50..88edad8e38e78f204d321a761e96e2bf0cf37690 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -16,7 +16,7 @@
 
     <style name="ThemeOverlay.App.MaterialAlertDialog" parent="ThemeOverlay.Material3.MaterialAlertDialog">
         <item name="elevationOverlayEnabled">false</item>
-        <item name="colorSurface">@color/e_floating_background</item>
+        <item name="colorSurfaceContainerHigh">@color/e_floating_background</item>
         <item name="buttonBarPositiveButtonStyle">@style/Widget.App.Button</item>
         <item name="buttonBarNegativeButtonStyle">@style/Widget.App.Button</item>
     </style>
diff --git a/settings.gradle.kts b/settings.gradle.kts
index b29d606e5bf15aa71d1768bc712577e6d8968374..0481d5127de7a50a536d8a74f4a116bd77234b78 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -18,6 +18,7 @@ dependencyResolutionManagement {
         google()
         mavenCentral()
         maven("https://raw.githubusercontent.com/lineage-next/crcalc/main/.m2")
+        maven("https://gitlab.e.foundation/api/v4/groups/9/-/packages/maven")
     }
 }