diff --git a/buildSrc/src/main/groovy/io.micronaut.build.internal.crac-module.gradle b/buildSrc/src/main/groovy/io.micronaut.build.internal.crac-module.gradle
index 085841ce..a8555f12 100644
--- a/buildSrc/src/main/groovy/io.micronaut.build.internal.crac-module.gradle
+++ b/buildSrc/src/main/groovy/io.micronaut.build.internal.crac-module.gradle
@@ -5,13 +5,14 @@ plugins {
 dependencies {
     api(libs.managed.crac)
     compileOnly(mn.micronaut.http.server.netty)
-    compileOnly(mn.micronaut.jdbc.hikari)
-    compileOnly(mn.micronaut.data.tx)
+    compileOnly(mnSql.micronaut.jdbc.hikari)
+    compileOnly(mnData.micronaut.data.tx)
 
-    testImplementation(mn.micronaut.data.tx)
-    testImplementation(mn.micronaut.jdbc.hikari)
+    testImplementation(mnData.micronaut.data.tx)
+    testImplementation(mnSql.micronaut.jdbc.hikari)
+    testImplementation(mnSerde.micronaut.serde.jackson)
     testImplementation(mn.micronaut.http.server.netty)
     testImplementation(mn.groovy.sql)
-    testImplementation(mn.logback)
-    testRuntimeOnly(mn.h2)
+    testImplementation(mn.logback.classic)
+    testRuntimeOnly(mnSql.h2)
 }
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index e8f5b18f..c1b8e128 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -96,11 +96,13 @@
         <!-- Checks for Javadoc comments.                     -->
         <!-- See https://checkstyle.org/config_javadoc.html -->
         <module name="JavadocMethod">
-            <property name="excludeScope" value="private"/>
+            <property name="accessModifiers" value="public, protected"/>
         </module>
         <module name="JavadocType"/>
         <module name="JavadocStyle"/>
-        <module name="MissingJavadocType"/>
+        <module name="MissingJavadocType">
+            <property name="severity" value="warning"/>
+        </module>
 
         <!-- Checks for Naming Conventions.                  -->
         <!-- See https://checkstyle.org/config_naming.html -->
diff --git a/crac/build.gradle.kts b/crac/build.gradle.kts
index 749d18b7..5d473587 100644
--- a/crac/build.gradle.kts
+++ b/crac/build.gradle.kts
@@ -1,7 +1,3 @@
 plugins {
     id("io.micronaut.build.internal.crac-module")
 }
-
-dependencies {
-    testImplementation(mn.micronaut.serde.jackson)
-}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a78f1115..e09536aa 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,10 +1,20 @@
 [versions]
 micronaut = "4.0.0-SNAPSHOT"
+micronaut-data = "3.8.1"
 micronaut-docs = "2.0.0"
+micronaut-serialization = "2.0.0-SNAPSHOT"
+micronaut-sql = "5.0.0-SNAPSHOT"
 micronaut-test = "4.0.0-SNAPSHOT"
+
 groovy = "4.0.6"
 spock = "2.3-groovy-4.0"
+
 managed-crac = "0.1.3"
 
 [libraries]
+micronaut-serde = { module = "io.micronaut.serde:micronaut-serde-bom", version.ref = "micronaut-serialization" }
+micronaut-sql = { module = "io.micronaut.sql:micronaut-sql-bom", version.ref = "micronaut-sql" }
+micronaut-data = { module = "io.micronaut.data:micronaut-data-bom", version.ref = "micronaut-data" }
+
 managed-crac = { module = "io.github.crac:org-crac", version.ref = "managed-crac" }
+
diff --git a/settings.gradle b/settings.gradle
index a99bf0f7..df12dfe5 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,15 +6,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'io.micronaut.build.shared.settings' version '6.0.2'
-}
-
-// Required for 4.0.0-SNAPSHOT, can be removed after
-dependencyResolutionManagement {
-    repositories {
-        maven { url = "https://s01.oss.sonatype.org/content/repositories/snapshots" }
-        mavenLocal()
-    }
+    id 'io.micronaut.build.shared.settings' version '6.1.1'
 }
 
 rootProject.name = 'crac-parent'
@@ -23,5 +15,10 @@ include 'crac'
 include 'crac-bom'
 
 micronautBuild {
+    // Required for 4.0.0-SNAPSHOT, can be removed after
+    addSnapshotRepository()
     importMicronautCatalog()
+    importMicronautCatalog("micronaut-data")
+    importMicronautCatalog("micronaut-serde")
+    importMicronautCatalog("micronaut-sql")
 }