diff --git a/airbyte-db/jooq/build.gradle.kts b/airbyte-db/jooq/build.gradle.kts
index 6a4b2d6138a..bb5c7b1b3b6 100644
--- a/airbyte-db/jooq/build.gradle.kts
+++ b/airbyte-db/jooq/build.gradle.kts
@@ -14,14 +14,13 @@ dependencies {
   implementation(project(":oss:airbyte-db:db-lib"))
 
   // jOOQ code generation)
-  implementation(libs.jooq.codegen)
-  implementation(libs.platform.testcontainers.postgresql)
+  jooqGenerator(libs.platform.testcontainers.postgresql)
 
   // These are required because gradle might be using lower version of Jna from other
   // library transitive dependency. Can be removed if we can figure out which library is the cause.
   // Refer: https://github.com/testcontainers/testcontainers-java/issues/3834#issuecomment-825409079
-  implementation(libs.jna)
-  implementation(libs.jna.platform)
+  jooqGenerator(libs.jna)
+  jooqGenerator(libs.jna.platform)
 
   // The jOOQ code generator(only has access to classes added to the jooqGenerator configuration
   jooqGenerator(project(":oss:airbyte-db:db-lib")) {
@@ -94,10 +93,11 @@ sourceSets["main"].java {
   )
 }
 
-
 sourceSets["main"].java {
-  srcDirs("${project.layout.buildDirectory.get()}/generated/configsDatabase/src/main/java",
-    "${project.layout.buildDirectory.get()}/generated/jobsDatabase/src/main/java")
+  srcDirs(
+    "${project.layout.buildDirectory.get()}/generated/configsDatabase/src/main/java",
+    "${project.layout.buildDirectory.get()}/generated/jobsDatabase/src/main/java",
+  )
 }
 
 tasks.named<JooqGenerate>("generateConfigsDatabaseJooq") {
diff --git a/airbyte-keycloak-setup/build.gradle.kts b/airbyte-keycloak-setup/build.gradle.kts
index c2b51c53bc4..fc665f2087e 100644
--- a/airbyte-keycloak-setup/build.gradle.kts
+++ b/airbyte-keycloak-setup/build.gradle.kts
@@ -29,6 +29,7 @@ dependencies {
   testImplementation(libs.bundles.micronaut.test)
   testImplementation(libs.bundles.junit)
   testImplementation(libs.junit.jupiter.system.stubs)
+  testImplementation(libs.platform.testcontainers.postgresql)
 
   testImplementation(project(":oss:airbyte-test-utils"))
 }