diff --git a/.github/workflows/shadow_job.yml b/.github/workflows/shadow_job.yml
index 31cf7a494..e806e377b 100644
--- a/.github/workflows/shadow_job.yml
+++ b/.github/workflows/shadow_job.yml
@@ -47,10 +47,6 @@ jobs:
     - name: Copy CI gradle.properties
       run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
 
-    - name: Workaround AGP 8.x deprecations
-      if: startsWith(matrix.agp-version, '8.')
-      run: sed -i 's/android.disableAutomaticComponentCreation=true//' gradle.properties
-
     - name: Run checks
       uses: gradle/gradle-build-action@5056fa9d50478a14af3c9925c12ca02318659d3e # v2.4.1
       env:
diff --git a/gradle.properties b/gradle.properties
index c69960062..66e69382a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -53,9 +53,6 @@ android.enableResourceOptimizations=true
 # Compatibility with Gradle 8.0
 android.experimental.legacyTransform.forceNonIncremental=true
 
-# Opt into new publishing APIs
-android.disableAutomaticComponentCreation=true
-
 # Default Android build features
 android.defaults.buildfeatures.buildconfig=false
 android.defaults.buildfeatures.aidl=false
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 2b99cc181..8a68148ab 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "7.4.2"
+agp = "8.0.0"
 androidxActivity = "1.7.0"
 bouncycastle = "1.73"
 # @keep used for kotlinCompilerExtensionVersion