diff --git a/core/data/build.gradle.dcl b/core/data/build.gradle.dcl
index 3815ebff4..658edd099 100644
--- a/core/data/build.gradle.dcl
+++ b/core/data/build.gradle.dcl
@@ -7,6 +7,9 @@ androidLibrary {
         api(project(":core:datastore"))
         api(project(":core:network"))
 
+        // TODO: once deps in conventions are not REPLACED by project deps, this can be removed
+        implementation("androidx.tracing:tracing-ktx:1.3.0-alpha02")
+
         implementation(project(":core:analytics"))
         implementation(project(":core:notifications"))
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ee68b116f..3f808031e 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-20240425125209+0000-bin.zip
+distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-8.9-branch-gh_declarative_dependencies_conventions-20240514203210+0000-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/settings.gradle.dcl b/settings.gradle.dcl
index 9e0bf5b81..8c0034584 100644
--- a/settings.gradle.dcl
+++ b/settings.gradle.dcl
@@ -36,6 +36,16 @@ dependencyResolutionManagement {
         mavenCentral()
     }
 }
+
+// Conventions for NiA libraries
+androidLibrary {
+    jdkVersion = 11
+
+    dependencies {
+        implementation("androidx.tracing:tracing-ktx:1.3.0-alpha02")
+    }
+}
+
 rootProject.name = "nowinandroid"
 
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
@@ -69,4 +79,3 @@ include(":lint")
 include(":sync:work")
 include(":sync:sync-test")
 include(":ui-test-hilt-manifest")
-