diff --git a/build.gradle b/build.gradle
index e98644e..815867c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ repositories {
 }
 
 def freefairGradleVersion = "8.4"
-def agpVersion = "8.2.1"
+def agpVersion = "8.3.0-beta01"
 
 group = 'io.freefair.gradle'
 description = "FreeFair Android Gradle Plugins"
diff --git a/src/main/java/io/freefair/gradle/plugins/android/AndroidJavadocPlugin.java b/src/main/java/io/freefair/gradle/plugins/android/AndroidJavadocPlugin.java
index f505fd2..2bf1945 100644
--- a/src/main/java/io/freefair/gradle/plugins/android/AndroidJavadocPlugin.java
+++ b/src/main/java/io/freefair/gradle/plugins/android/AndroidJavadocPlugin.java
@@ -61,7 +61,7 @@ public TaskProvider<Javadoc> getJavadocTask(Project project, Variant variant) {
 
                 javadoc.setClasspath(variant.getCompileClasspath());
 
-                CommonExtension<?, ?, ?, ?, ?> android = AndroidProjectUtil.getAndroidExtension(project);
+                CommonExtension<?, ?, ?, ?, ?, ?> android = AndroidProjectUtil.getAndroidExtension(project);
 
                 javadoc.getOptions().setSource(android.getCompileOptions().getSourceCompatibility().getMajorVersion());
 
diff --git a/src/main/java/io/freefair/gradle/plugins/android/AndroidProjectUtil.java b/src/main/java/io/freefair/gradle/plugins/android/AndroidProjectUtil.java
index e257453..72d108d 100644
--- a/src/main/java/io/freefair/gradle/plugins/android/AndroidProjectUtil.java
+++ b/src/main/java/io/freefair/gradle/plugins/android/AndroidProjectUtil.java
@@ -16,7 +16,7 @@
 @UtilityClass
 public class AndroidProjectUtil {
 
-    public static CommonExtension<?, ?, ?, ?, ?> getAndroidExtension(Project project) {
+    public static CommonExtension<?, ?, ?, ?, ?, ?> getAndroidExtension(Project project) {
         try {
             return project.getExtensions().getByType(CommonExtension.class);
         } catch (UnknownDomainObjectException e) {
diff --git a/src/main/java/io/freefair/gradle/plugins/android/aspectj/AndroidAspectJPostCompileWeavingPlugin.java b/src/main/java/io/freefair/gradle/plugins/android/aspectj/AndroidAspectJPostCompileWeavingPlugin.java
index f09411e..4b53da3 100644
--- a/src/main/java/io/freefair/gradle/plugins/android/aspectj/AndroidAspectJPostCompileWeavingPlugin.java
+++ b/src/main/java/io/freefair/gradle/plugins/android/aspectj/AndroidAspectJPostCompileWeavingPlugin.java
@@ -39,7 +39,7 @@ public void apply(Project project) {
         inpath = project.getConfigurations().create("inpath");
         aspectpath = project.getConfigurations().create("aspect");
 
-        CommonExtension<?, ?, ?, ?, ?> android = project.getExtensions().getByType(CommonExtension.class);
+        CommonExtension<?, ?, ?, ?, ?, ?> android = project.getExtensions().getByType(CommonExtension.class);
         AndroidComponentsExtension<?, ?, ?> androidComponents = project.getExtensions().getByType(AndroidComponentsExtension.class);
 
         android.getBuildTypes().configureEach(buildType -> {
diff --git a/src/main/java/io/freefair/gradle/plugins/android/ci/CiLintPlugin.java b/src/main/java/io/freefair/gradle/plugins/android/ci/CiLintPlugin.java
index 8e6f7e5..09354af 100644
--- a/src/main/java/io/freefair/gradle/plugins/android/ci/CiLintPlugin.java
+++ b/src/main/java/io/freefair/gradle/plugins/android/ci/CiLintPlugin.java
@@ -10,7 +10,7 @@ public class CiLintPlugin implements Plugin<Project> {
     @Override
     public void apply(Project project) {
         if (CiUtil.isCi()) {
-            CommonExtension<?, ?, ?, ?, ?> extension = AndroidProjectUtil.getAndroidExtension(project);
+            CommonExtension<?, ?, ?, ?, ?, ?> extension = AndroidProjectUtil.getAndroidExtension(project);
 
             extension.getLint().setHtmlReport(false);
             extension.getLint().setXmlReport(false);
diff --git a/src/main/java/io/freefair/gradle/plugins/android/lombok/AndroidLombokPlugin.java b/src/main/java/io/freefair/gradle/plugins/android/lombok/AndroidLombokPlugin.java
index c4ebe37..d3f5366 100644
--- a/src/main/java/io/freefair/gradle/plugins/android/lombok/AndroidLombokPlugin.java
+++ b/src/main/java/io/freefair/gradle/plugins/android/lombok/AndroidLombokPlugin.java
@@ -34,7 +34,7 @@ public void apply(Project project) {
         LombokPlugin lombokPlugin = project.getPlugins().apply(LombokPlugin.class);
         lombokBasePlugin = lombokPlugin.getLombokBasePlugin();
 
-        CommonExtension<?, ?, ?, ?, ?> android = AndroidProjectUtil.getAndroidExtension(project);
+        CommonExtension<?, ?, ?, ?, ?, ?> android = AndroidProjectUtil.getAndroidExtension(project);
         AndroidComponentsExtension<?, ?, ?> androidComponents = AndroidProjectUtil.getAndroidComponentsExtension(project);
 
         project.afterEvaluate(p -> {