diff --git a/code/build.gradle.kts b/code/build.gradle.kts
index 17402fe20..db4563838 100644
--- a/code/build.gradle.kts
+++ b/code/build.gradle.kts
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("com.github.adobe:aepsdk-commons:gp-3.4.1")
+        classpath("com.github.adobe.aepsdk-commons:aepsdk-gradle-plugin:4.0.0")
         classpath("org.jetbrains.kotlinx:binary-compatibility-validator:0.13.2")
         classpath("androidx.benchmark:benchmark-gradle-plugin:1.2.3")
     }
diff --git a/code/core/src/main/java/com/adobe/marketing/mobile/internal/CoreConstants.kt b/code/core/src/main/java/com/adobe/marketing/mobile/internal/CoreConstants.kt
index daadaaa07..15df924e9 100644
--- a/code/core/src/main/java/com/adobe/marketing/mobile/internal/CoreConstants.kt
+++ b/code/core/src/main/java/com/adobe/marketing/mobile/internal/CoreConstants.kt
@@ -13,7 +13,7 @@ package com.adobe.marketing.mobile.internal
 
 internal object CoreConstants {
     const val LOG_TAG = "MobileCore"
-    const val VERSION = "3.6.0"
+    const val VERSION = "4.0.0"
 
     object EventDataKeys {
         /**
diff --git a/code/gradle.properties b/code/gradle.properties
index bde0ddad9..08d5d3d32 100644
--- a/code/gradle.properties
+++ b/code/gradle.properties
@@ -5,22 +5,22 @@ android.useAndroidX=true
 
 #Maven artifacts
 #Core extension
-coreExtensionVersion=3.6.0
+coreExtensionVersion=4.0.0
 coreExtensionName=core
 coreMavenRepoName=AdobeMobileCoreSdk
 coreMavenRepoDescription=Android Core Extension for Adobe Mobile Marketing
 #Signal extension
-signalExtensionVersion=3.0.1
+signalExtensionVersion=4.0.0
 signalExtensionName=signal
 signalMavenRepoName=AdobeMobileSignalSdk
 signalMavenRepoDescription=Android Signal Extension for Adobe Mobile Marketing
 #Lifecycle extension
-lifecycleExtensionVersion=3.0.2
+lifecycleExtensionVersion=4.0.0
 lifecycleExtensionName=lifecycle
 lifecycleMavenRepoName=AdobeMobileLifecycleSdk
 lifecycleMavenRepoDescription=Android Lifecycle Extension for Adobe Mobile Marketing
 #Identity extension
-identityExtensionVersion=3.0.2
+identityExtensionVersion=4.0.0
 identityExtensionName=identity
 identityMavenRepoName=AdobeMobileIdentitySdk
 identityMavenRepoDescription=Android Identity Extension for Adobe Mobile Marketing
diff --git a/code/gradle/wrapper/gradle-wrapper.properties b/code/gradle/wrapper/gradle-wrapper.properties
index b93c46a5f..11581996b 100644
--- a/code/gradle/wrapper/gradle-wrapper.properties
+++ b/code/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/code/identity/src/phone/java/com/adobe/marketing/mobile/Identity.java b/code/identity/src/phone/java/com/adobe/marketing/mobile/Identity.java
index 1b539acbe..69d8fc64b 100644
--- a/code/identity/src/phone/java/com/adobe/marketing/mobile/Identity.java
+++ b/code/identity/src/phone/java/com/adobe/marketing/mobile/Identity.java
@@ -26,7 +26,7 @@
 public class Identity {
 
     private static final String CLASS_NAME = "Identity";
-    private static final String EXTENSION_VERSION = "3.0.2";
+    private static final String EXTENSION_VERSION = "4.0.0";
     private static final String REQUEST_IDENTITY_EVENT_NAME = "IdentityRequestIdentity";
     private static final int PUBLIC_API_TIME_OUT_MILLISECOND = 500; // ms
     private static final String LOG_TAG = "Identity";
diff --git a/code/lifecycle/src/phone/java/com/adobe/marketing/mobile/Lifecycle.java b/code/lifecycle/src/phone/java/com/adobe/marketing/mobile/Lifecycle.java
index 5e34a60c5..e4df5ee23 100644
--- a/code/lifecycle/src/phone/java/com/adobe/marketing/mobile/Lifecycle.java
+++ b/code/lifecycle/src/phone/java/com/adobe/marketing/mobile/Lifecycle.java
@@ -15,7 +15,7 @@
 
 public class Lifecycle {
 
-    private static final String EXTENSION_VERSION = "3.0.2";
+    private static final String EXTENSION_VERSION = "4.0.0";
 
     public static final Class<? extends Extension> EXTENSION = LifecycleExtension.class;
 
diff --git a/code/signal/src/phone/java/com/adobe/marketing/mobile/Signal.java b/code/signal/src/phone/java/com/adobe/marketing/mobile/Signal.java
index d3b0d9f5c..6a4bd565a 100644
--- a/code/signal/src/phone/java/com/adobe/marketing/mobile/Signal.java
+++ b/code/signal/src/phone/java/com/adobe/marketing/mobile/Signal.java
@@ -15,7 +15,7 @@
 
 public class Signal {
 
-    private static final String EXTENSION_VERSION = "3.0.1";
+    private static final String EXTENSION_VERSION = "4.0.0";
     private static final String CLASS_NAME = "Signal";
 
     public static final Class<? extends Extension> EXTENSION = SignalExtension.class;
diff --git a/code/testapp/build.gradle.kts b/code/testapp/build.gradle.kts
index c183b4660..14bbf9570 100644
--- a/code/testapp/build.gradle.kts
+++ b/code/testapp/build.gradle.kts
@@ -2,6 +2,7 @@ import com.adobe.marketing.mobile.gradle.BuildConstants
 plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
+    id("org.jetbrains.kotlin.plugin.compose")
 }
 
 android {
@@ -40,9 +41,6 @@ android {
     buildFeatures {
         compose = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = BuildConstants.Versions.COMPOSE_COMPILER
-    }
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
diff --git a/code/testutils/build.gradle.kts b/code/testutils/build.gradle.kts
index 90623eb75..eb3e2842a 100644
--- a/code/testutils/build.gradle.kts
+++ b/code/testutils/build.gradle.kts
@@ -23,7 +23,7 @@ val jacksonVersion = "2.12.7"
 aepLibrary {
     namespace = "com.adobe.marketing.mobile.testutils"
     moduleName = "testutils"
-    moduleVersion = "3.0.0"
+    moduleVersion = "4.0.0"
     enableSpotless = true
     enableSpotlessPrettierForJava = true
     enableDokkaDoc = true