diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..16ca8d0
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,12 @@
+android_app {
+    name: "GcamServicesProvider",
+    srcs: [
+        "app/src/main/java/**/*.kt",
+    ],
+    resource_dirs: [
+        "app/src/main/res",
+    ],
+    manifest: "app/src/main/AndroidManifest.xml",
+    sdk_version: "current",
+    product_specific: true,
+}
diff --git a/app/build.gradle b/app/build.gradle
index 93d5ff1..476d32d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,7 +5,6 @@ android {
     compileSdkVersion 30
 
     defaultConfig {
-        applicationId "de.lukaspieper.gcam.services"
         minSdkVersion 19
         targetSdkVersion 30
         versionCode 2
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index eb78e48..50e236f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.google.android.gms">
+    package="de.lukaspieper.gcam.services">
 
     <application
         android:forceQueryable="true"
@@ -12,7 +12,7 @@
         tools:targetApi="30">
 
         <provider
-            android:name=".GServicesProvider"
+            android:name="com.google.android.gms.GServicesProvider"
             android:authorities="com.google.android.gsf.gservices"
             android:exported="true"
             tools:ignore="ExportedContentProvider" />
diff --git a/app/src/main/java/com/google/android/gms/GServicesProvider.kt b/app/src/main/java/de/lukaspieper/gcam/services/GServicesProvider.kt
similarity index 100%
rename from app/src/main/java/com/google/android/gms/GServicesProvider.kt
rename to app/src/main/java/de/lukaspieper/gcam/services/GServicesProvider.kt