diff --git a/core/data/build.gradle.dcl b/core/data/build.gradle.dcl
index 7a779feae..51a94d283 100644
--- a/core/data/build.gradle.dcl
+++ b/core/data/build.gradle.dcl
@@ -12,10 +12,7 @@ androidLibrary {
     }
 
     hilt {}
-
-    kotlinSerialization {
-        jsonEnabled = true
-    }
+    kotlinSerialization {}
 
     testing {
         dependencies {
@@ -25,9 +22,7 @@ androidLibrary {
             implementation(project(":core:network"))
         }
 
-        jacoco {
-            version = "0.8.7"
-        }
+        jacoco {}
 
         testOptions {
             includeAndroidResources = true
diff --git a/core/domain/build.gradle.dcl b/core/domain/build.gradle.dcl
index 7c05f6eff..2cae7cc8f 100644
--- a/core/domain/build.gradle.dcl
+++ b/core/domain/build.gradle.dcl
@@ -13,8 +13,6 @@ androidLibrary {
             implementation(project(":core:testing"))
         }
 
-        jacoco {
-            version = "0.8.7"
-        }
+        jacoco {}
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c0c32d104..8f61ff4de 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-snapshots/gradle-8.9-20240518001543+0000-bin.zip
+distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-8.9-branch-gh_declarative_convention_rules-20240520154301+0000-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/settings.gradle.dcl b/settings.gradle.dcl
index 9e0bf5b81..ef20cc7ff 100644
--- a/settings.gradle.dcl
+++ b/settings.gradle.dcl
@@ -38,6 +38,27 @@ dependencyResolutionManagement {
 }
 rootProject.name = "nowinandroid"
 
+conventions {
+    androidLibrary {
+        jdkVersion = 11
+        compileSdk = 34
+
+        dependencies {
+            implementation("androidx.tracing:tracing-ktx:1.3.0-alpha02")
+        }
+
+        kotlinSerialization {
+            jsonEnabled = true
+        }
+
+        testing {
+            jacoco {
+                version = "0.8.7"
+            }
+        }
+    }
+}
+
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 include(":app")
 include(":app-nia-catalog")
@@ -69,4 +90,3 @@ include(":lint")
 include(":sync:work")
 include(":sync:sync-test")
 include(":ui-test-hilt-manifest")
-