diff --git a/build.gradle.kts b/build.gradle.kts
index 0a7cf510..c08d6990 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,6 +6,7 @@ plugins {
   id("org.hypertrace.ci-utils-plugin") version "0.4.0"
   id("org.hypertrace.publish-plugin") version "1.1.1" apply false
   id("org.hypertrace.code-style-plugin") version "2.1.2" apply false
+  id("org.hypertrace.java-convention") version "0.4.0"
   id("org.owasp.dependencycheck") version "12.1.0"
 }
 
diff --git a/document-store/build.gradle.kts b/document-store/build.gradle.kts
index 5a3fc02f..82e49998 100644
--- a/document-store/build.gradle.kts
+++ b/document-store/build.gradle.kts
@@ -22,7 +22,6 @@ dependencies {
 
   testImplementation(libs.org.junit.jupiter.junit.jupiter)
   testImplementation(libs.org.mockito.mockito.core)
-  testImplementation(libs.org.mockito.mockito.inline)
   testImplementation(libs.org.mockito.mockito.junit.jupiter)
 
   integrationTestImplementation(libs.org.junit.jupiter.junit.jupiter)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5fe07d98..2cc162d7 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 org-jacoco = "0.8.8"
 org-jetbrains-kotlin = "1.7.10"
-org-mockito = "5.2.0"
+org-mockito = "5.8.0"
 org-testcontainers = "1.17.6"
 
 [libraries]
@@ -24,7 +24,6 @@ org-jetbrains-kotlin-kotlin-stdlib-jdk7 = { module = "org.jetbrains.kotlin:kotli
 org-jetbrains-kotlin-kotlin-stdlib-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "org-jetbrains-kotlin" }
 org-junit-jupiter-junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version = "5.9.2" }
 org-mockito-mockito-core = { module = "org.mockito:mockito-core", version.ref = "org-mockito" }
-org-mockito-mockito-inline = { module = "org.mockito:mockito-inline", version.ref = "org-mockito" }
 org-mockito-mockito-junit-jupiter = { module = "org.mockito:mockito-junit-jupiter", version.ref = "org-mockito" }
 org-mongodb-mongodb-driver-sync = { module = "org.mongodb:mongodb-driver-sync", version = "5.2.0" }
 org-postgresql = { module = "org.postgresql:postgresql", version = "42.5.5" }