diff --git a/.github/workflows/supplychain-build.yml b/.github/workflows/supplychain-build.yml
index b0eec221..34a9a780 100644
--- a/.github/workflows/supplychain-build.yml
+++ b/.github/workflows/supplychain-build.yml
@@ -23,7 +23,7 @@ jobs:
         uses: actions/setup-java@cf277c60eb25467037889841efdb72551f06f6c3 # v4.9.1
         with:
           distribution: "temurin"
-          java-version: "11"
+          java-version: "17"
 
         # Only cache if it's a fork
       - name: Cache Gradle dependencies
diff --git a/android/build.gradle b/android/build.gradle
index 4b91ead4..53750126 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -6,8 +6,13 @@ plugins {
 }
 
 android {
+    namespace 'com.segment.analytics'
     compileSdkVersion 33
 
+    buildFeatures {
+        buildConfig true
+    }
+
     defaultConfig {
         // Required when setting minSdkVersion to 20 or lower
         multiDexEnabled true
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
index 96c9ac36..a5918e68 100644
--- a/android/src/main/AndroidManifest.xml
+++ b/android/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.segment.analytics">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 6ea8ef44..f32b994b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.10.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
 
diff --git a/gradle.properties b/gradle.properties
index fc96e044..31853c6d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,7 +19,6 @@ android.useAndroidX=true
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-android.disableAutomaticComponentCreation=true
 
 # Deployment variables
 GROUP=com.segment.analytics.kotlin
diff --git a/samples/java-android-app/build.gradle b/samples/java-android-app/build.gradle
index 7b70132d..c9079cae 100644
--- a/samples/java-android-app/build.gradle
+++ b/samples/java-android-app/build.gradle
@@ -3,8 +3,13 @@ plugins {
 }
 
 android {
+    namespace 'com.segment.analytics.javaandroidapp'
     compileSdkVersion 33
 
+    buildFeatures {
+        buildConfig true
+    }
+
     defaultConfig {
         applicationId "com.segment.analytics.javaandroidapp"
         minSdkVersion 16
diff --git a/samples/java-android-app/src/main/AndroidManifest.xml b/samples/java-android-app/src/main/AndroidManifest.xml
index df064bcd..e6382c1f 100644
--- a/samples/java-android-app/src/main/AndroidManifest.xml
+++ b/samples/java-android-app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.segment.analytics.javaandroidapp">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:name=".MainApplication"
diff --git a/samples/kotlin-android-app-destinations/build.gradle b/samples/kotlin-android-app-destinations/build.gradle
index 51ec6b6e..b6967c03 100644
--- a/samples/kotlin-android-app-destinations/build.gradle
+++ b/samples/kotlin-android-app-destinations/build.gradle
@@ -5,8 +5,13 @@ plugins {
 }
 
 android {
+    namespace 'com.segment.analytics.kotlin.destinations'
     compileSdkVersion 33
 
+    buildFeatures {
+        buildConfig true
+    }
+
     defaultConfig {
         multiDexEnabled true
         applicationId "com.segment.analytics.kotlin.destinations"
diff --git a/samples/kotlin-android-app-destinations/src/main/AndroidManifest.xml b/samples/kotlin-android-app-destinations/src/main/AndroidManifest.xml
index 44d69d0a..f423e089 100644
--- a/samples/kotlin-android-app-destinations/src/main/AndroidManifest.xml
+++ b/samples/kotlin-android-app-destinations/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.segment.analytics.kotlin.destinations">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- Required for internet. -->
     <uses-permission android:name="android.permission.INTERNET" />
diff --git a/samples/kotlin-android-app/build.gradle b/samples/kotlin-android-app/build.gradle
index e260d239..95bdaaef 100644
--- a/samples/kotlin-android-app/build.gradle
+++ b/samples/kotlin-android-app/build.gradle
@@ -6,8 +6,13 @@ plugins {
 }
 
 android {
+    namespace 'com.segment.analytics.next'
     compileSdkVersion 33
 
+    buildFeatures {
+        buildConfig true
+    }
+
     defaultConfig {
         multiDexEnabled true
         applicationId "com.segment.analytics.next"
diff --git a/samples/kotlin-android-app/src/main/AndroidManifest.xml b/samples/kotlin-android-app/src/main/AndroidManifest.xml
index 01659170..4fd29c75 100644
--- a/samples/kotlin-android-app/src/main/AndroidManifest.xml
+++ b/samples/kotlin-android-app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.segment.analytics.next">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- Required for internet. -->
     <uses-permission android:name="android.permission.INTERNET" />