diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 4bbdde1..bc36b20 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -48,7 +48,7 @@ jobs:
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2.4.2
         with:
-          gradle-version: 8.10.2
+          gradle-version: 8.11.1
 
       # Manually build the java bytecode
       - name: Execute Gradle build
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 226ac1f..4a9714a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ include:
 # SETUP
 
 variables:
-  CURRENT_CI_IMAGE: "9"
+  CURRENT_CI_IMAGE: "10"
   CI_IMAGE_DOCKER: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/dd-sdk-android-gradle-plugin:$CURRENT_CI_IMAGE
   GIT_DEPTH: 5
 
diff --git a/Dockerfile.gitlab b/Dockerfile.gitlab
index 44b1658..234e87b 100644
--- a/Dockerfile.gitlab
+++ b/Dockerfile.gitlab
@@ -24,7 +24,7 @@ RUN set -x \
  && apt-get -y clean \
  && rm -rf /var/lib/apt/lists/*
 
-ENV GRADLE_VERSION 8.10.2
+ENV GRADLE_VERSION 8.11.1
 ENV ANDROID_COMPILE_SDK 35
 ENV ANDROID_BUILD_TOOLS 35.0.0
 ENV ANDROID_SDK_TOOLS 11076708
diff --git a/dd-sdk-android-gradle-plugin/src/test/kotlin/com/datadog/gradle/plugin/internal/variant/NewApiAppVariantTest.kt b/dd-sdk-android-gradle-plugin/src/test/kotlin/com/datadog/gradle/plugin/internal/variant/NewApiAppVariantTest.kt
index 9f19b54..3748aaa 100644
--- a/dd-sdk-android-gradle-plugin/src/test/kotlin/com/datadog/gradle/plugin/internal/variant/NewApiAppVariantTest.kt
+++ b/dd-sdk-android-gradle-plugin/src/test/kotlin/com/datadog/gradle/plugin/internal/variant/NewApiAppVariantTest.kt
@@ -128,7 +128,7 @@ internal class NewApiAppVariantTest {
                 whenever(nonValidOutput.versionCode) doReturn fakeVersionCode.asProperty()
             } else {
                 whenever(nonValidOutput.enabled) doReturn true.asProperty()
-                whenever(nonValidOutput.versionCode) doReturn null.asProperty()
+                whenever(nonValidOutput.versionCode) doReturn 1.asProperty().unset()
             }
             nonValidOutput
         }
@@ -151,7 +151,7 @@ internal class NewApiAppVariantTest {
         val validOutput = mock<VariantOutput>()
         whenever(validOutput.enabled) doReturn true.asProperty()
         whenever(validOutput.versionCode) doReturn fakeVersionCode.asProperty()
-        whenever(validOutput.versionName) doReturn null.asProperty()
+        whenever(validOutput.versionName) doReturn "".asProperty().unset()
         val fakeNonValidOutputs = forge.aList {
             val nonValidOutput = mock<VariantOutput>()
             if (forge.aBool()) {
@@ -159,7 +159,7 @@ internal class NewApiAppVariantTest {
                 whenever(nonValidOutput.versionCode) doReturn fakeVersionCode.asProperty()
             } else {
                 whenever(nonValidOutput.enabled) doReturn true.asProperty()
-                whenever(nonValidOutput.versionCode) doReturn null.asProperty()
+                whenever(nonValidOutput.versionCode) doReturn 1.asProperty().unset()
             }
             nonValidOutput
         }
@@ -188,7 +188,7 @@ internal class NewApiAppVariantTest {
                 whenever(nonValidOutput.versionCode) doReturn fakeVersionCode.asProperty()
             } else {
                 whenever(nonValidOutput.enabled) doReturn true.asProperty()
-                whenever(nonValidOutput.versionCode) doReturn null.asProperty()
+                whenever(nonValidOutput.versionCode) doReturn 1.asProperty().unset()
             }
             nonValidOutput
         }
@@ -214,7 +214,7 @@ internal class NewApiAppVariantTest {
                 whenever(nonValidOutput.versionCode) doReturn fakeVersionCode.asProperty()
             } else {
                 whenever(nonValidOutput.enabled) doReturn true.asProperty()
-                whenever(nonValidOutput.versionCode) doReturn null.asProperty()
+                whenever(nonValidOutput.versionCode) doReturn 1.asProperty().unset()
             }
             nonValidOutput
         }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d670f37..95b6976 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -5,7 +5,7 @@ json = "20180813"
 okHttp = "4.12.0"
 
 # Android
-androidToolsPlugin = "8.6.1"
+androidToolsPlugin = "8.7.2"
 
 # AndroidX
 androidx-core ="1.3.2"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 79eb9d0..c1d5e01 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME