diff --git a/build.gradle b/build.gradle
index d7fe9a96..60699d2e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -28,7 +28,7 @@ buildscript {
     ext.wireVersion = '4.8.0'
 
 
-    ext.androidBuildGradleVersion = '7.4.2'
+    ext.androidBuildGradleVersion = '8.0.0'
     ext.androidBuildVersionTools = '33.0.2'
 
     ext.androidMinSdk = 23
diff --git a/fake-signature/build.gradle b/fake-signature/build.gradle
index 19f0fc40..e04d9893 100644
--- a/fake-signature/build.gradle
+++ b/fake-signature/build.gradle
@@ -17,8 +17,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
index 976747da..126b7d28 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,5 @@
 android.useAndroidX=true
-android.disableAutomaticComponentCreation=true
 org.gradle.jvmargs=-Xmx2048m -XX:+UseParallelGC
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b1624c47..42defcc9 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/play-services-api/build.gradle b/play-services-api/build.gradle
index e254f48d..20d8bea5 100644
--- a/play-services-api/build.gradle
+++ b/play-services-api/build.gradle
@@ -26,9 +26,13 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = 1.8
-        targetCompatibility = 1.8
+        sourceCompatibility = 17
+        targetCompatibility = 17
     }
+    buildFeatures {
+        aidl true
+    }
+    namespace 'org.microg.gms.api'
 }
 
 dependencies {
diff --git a/play-services-api/src/main/AndroidManifest.xml b/play-services-api/src/main/AndroidManifest.xml
index d4a4d07a..359a9b71 100644
--- a/play-services-api/src/main/AndroidManifest.xml
+++ b/play-services-api/src/main/AndroidManifest.xml
@@ -15,4 +15,4 @@
   ~ limitations under the License.
   -->
 
-<manifest package="org.microg.gms.api"/>
+<manifest />
diff --git a/play-services-base-api/build.gradle b/play-services-base-api/build.gradle
index b806da4c..23b6b07c 100644
--- a/play-services-base-api/build.gradle
+++ b/play-services-base-api/build.gradle
@@ -34,7 +34,11 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = 1.8
-        targetCompatibility = 1.8
+        sourceCompatibility = 17
+        targetCompatibility = 17
     }
+    buildFeatures {
+        aidl true
+    }
+    namespace 'org.microg.gms.base.api'
 }
\ No newline at end of file
diff --git a/play-services-base-api/src/main/AndroidManifest.xml b/play-services-base-api/src/main/AndroidManifest.xml
index 7c8eeef3..055d07d5 100644
--- a/play-services-base-api/src/main/AndroidManifest.xml
+++ b/play-services-base-api/src/main/AndroidManifest.xml
@@ -3,4 +3,4 @@
   ~ SPDX-FileCopyrightText: 2020, microG Project Team
   ~ SPDX-License-Identifier: Apache-2.0
   -->
-<manifest package="org.microg.gms.base.api"/>
+<manifest />
diff --git a/play-services-base-core/build.gradle b/play-services-base-core/build.gradle
index ad962700..34288f21 100644
--- a/play-services-base-core/build.gradle
+++ b/play-services-base-core/build.gradle
@@ -21,7 +21,6 @@ android {
     buildToolsVersion androidBuildVersionTools
 
     defaultConfig {
-        versionName version
         minSdkVersion androidMinSdk
         targetSdkVersion androidTargetSdk
 
@@ -33,7 +32,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = 1.8
-        targetCompatibility = 1.8
+        sourceCompatibility = 17
+        targetCompatibility = 17
     }
+    namespace 'org.microg.gms.base.core'
 }
\ No newline at end of file
diff --git a/play-services-base-core/src/main/AndroidManifest.xml b/play-services-base-core/src/main/AndroidManifest.xml
index 39554ca3..5c321135 100644
--- a/play-services-base-core/src/main/AndroidManifest.xml
+++ b/play-services-base-core/src/main/AndroidManifest.xml
@@ -4,8 +4,7 @@
   ~ SPDX-License-Identifier: Apache-2.0
   -->
 <manifest xmlns:tools="http://schemas.android.com/tools"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.microg.gms.base.core">
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
         <provider
diff --git a/play-services-base/build.gradle b/play-services-base/build.gradle
index 8857d222..e1cff12a 100644
--- a/play-services-base/build.gradle
+++ b/play-services-base/build.gradle
@@ -26,9 +26,10 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = 1.8
-        targetCompatibility = 1.8
+        sourceCompatibility = 17
+        targetCompatibility = 17
     }
+    namespace 'org.microg.gms.base'
 }
 
 dependencies {
diff --git a/play-services-base/src/main/AndroidManifest.xml b/play-services-base/src/main/AndroidManifest.xml
index 3ab02d97..c31f1c05 100644
--- a/play-services-base/src/main/AndroidManifest.xml
+++ b/play-services-base/src/main/AndroidManifest.xml
@@ -15,8 +15,7 @@
   ~ limitations under the License.
   -->
 
-<manifest package="org.microg.gms.base"
-          xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
         <meta-data
diff --git a/play-services-basement/build.gradle b/play-services-basement/build.gradle
index 333ca3ac..9884e3c9 100644
--- a/play-services-basement/build.gradle
+++ b/play-services-basement/build.gradle
@@ -44,6 +44,7 @@ android {
 
     buildFeatures {
         viewBinding = true
+        aidl true
     }
 
     sourceSets {
@@ -51,7 +52,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = 1.8
-        targetCompatibility = 1.8
+        sourceCompatibility = 17
+        targetCompatibility = 17
     }
+    namespace 'org.microg.gms.basement'
 }
\ No newline at end of file
diff --git a/play-services-basement/src/main/AndroidManifest.xml b/play-services-basement/src/main/AndroidManifest.xml
index bd436773..359a9b71 100644
--- a/play-services-basement/src/main/AndroidManifest.xml
+++ b/play-services-basement/src/main/AndroidManifest.xml
@@ -15,4 +15,4 @@
   ~ limitations under the License.
   -->
 
-<manifest package="org.microg.gms.basement"/>
+<manifest />
diff --git a/play-services-core-proto/build.gradle b/play-services-core-proto/build.gradle
index 2cfb351e..6edfcb4b 100644
--- a/play-services-core-proto/build.gradle
+++ b/play-services-core-proto/build.gradle
@@ -21,9 +21,9 @@ sourceSets {
 }
 
 compileKotlin {
-    kotlinOptions.jvmTarget = 1.8
+    kotlinOptions.jvmTarget = 17
 }
 
 compileTestKotlin {
-    kotlinOptions.jvmTarget = 1.8
+    kotlinOptions.jvmTarget = 17
 }
\ No newline at end of file
diff --git a/play-services-core/build.gradle b/play-services-core/build.gradle
index 5cb9aedd..a9d2351a 100644
--- a/play-services-core/build.gradle
+++ b/play-services-core/build.gradle
@@ -109,8 +109,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     packagingOptions {
diff --git a/play-services-core/microg-ui-tools/build.gradle b/play-services-core/microg-ui-tools/build.gradle
index b6b2018d..260aa6a5 100644
--- a/play-services-core/microg-ui-tools/build.gradle
+++ b/play-services-core/microg-ui-tools/build.gradle
@@ -28,14 +28,15 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = 1.8
-        targetCompatibility = 1.8
+        sourceCompatibility = 17
+        targetCompatibility = 17
     }
 
     lintOptions {
         // TODO: Remove MissingTranslation once we have stable strings and proper translations.
         disable 'MissingTranslation', 'GetLocales'
     }
+    namespace 'org.microg.tools.ui'
 }
 
 dependencies {
diff --git a/play-services-core/microg-ui-tools/src/main/AndroidManifest.xml b/play-services-core/microg-ui-tools/src/main/AndroidManifest.xml
index 004f299c..359a9b71 100644
--- a/play-services-core/microg-ui-tools/src/main/AndroidManifest.xml
+++ b/play-services-core/microg-ui-tools/src/main/AndroidManifest.xml
@@ -15,4 +15,4 @@
   ~ limitations under the License.
   -->
 
-<manifest package="org.microg.tools.ui" />
+<manifest />
diff --git a/play-services-iid-api/build.gradle b/play-services-iid-api/build.gradle
index 603c53b4..34ed3abb 100644
--- a/play-services-iid-api/build.gradle
+++ b/play-services-iid-api/build.gradle
@@ -26,9 +26,13 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = 1.8
-        targetCompatibility = 1.8
+        sourceCompatibility = 17
+        targetCompatibility = 17
     }
+    buildFeatures {
+        aidl true
+    }
+    namespace 'org.microg.gms.iid.api'
 }
 
 dependencies {
diff --git a/play-services-iid-api/src/main/AndroidManifest.xml b/play-services-iid-api/src/main/AndroidManifest.xml
index e979258e..ca617cfb 100644
--- a/play-services-iid-api/src/main/AndroidManifest.xml
+++ b/play-services-iid-api/src/main/AndroidManifest.xml
@@ -15,4 +15,4 @@
   ~ limitations under the License.
   -->
 
-<manifest package="org.microg.gms.iid.api"/>
\ No newline at end of file
+<manifest />
\ No newline at end of file
diff --git a/play-services-tasks/build.gradle b/play-services-tasks/build.gradle
index 0eb84bbf..068aeb92 100644
--- a/play-services-tasks/build.gradle
+++ b/play-services-tasks/build.gradle
@@ -22,9 +22,10 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = 1.8
-        targetCompatibility = 1.8
+        sourceCompatibility = 17
+        targetCompatibility = 17
     }
+    namespace 'org.microg.gms.tasks'
 }
 
 dependencies {
diff --git a/play-services-tasks/src/main/AndroidManifest.xml b/play-services-tasks/src/main/AndroidManifest.xml
index c7b833fe..c256eb44 100644
--- a/play-services-tasks/src/main/AndroidManifest.xml
+++ b/play-services-tasks/src/main/AndroidManifest.xml
@@ -4,4 +4,4 @@
   ~ SPDX-License-Identifier: Apache-2.0
   -->
 
-<manifest package="org.microg.gms.tasks"/>
+<manifest />