diff --git a/.github/workflows/shadow_job.yml b/.github/workflows/shadow_job.yml
index f6f1afe3..810ebc06 100644
--- a/.github/workflows/shadow_job.yml
+++ b/.github/workflows/shadow_job.yml
@@ -41,6 +41,10 @@ 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.0.0')
+      run: sed -i 's/android.disableAutomaticComponentCreation=true//' gradle.properties
+
     - name: Run checks
       uses: gradle/gradle-build-action@3fbe033aaae657f011f88f29be9e65ed26bd29ef # v2.3.3
       env:
diff --git a/gradle.properties b/gradle.properties
index ff8d88df..0589b47e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -49,6 +49,9 @@ 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 9aa41e89..883a3647 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.0.0-alpha11"
+agp = "7.4.0"
 androidxActivity = "1.7.0-alpha03"
 bouncycastle = "1.72"
 # @keep used for kotlinCompilerExtensionVersion