diff --git a/buildSrc/src/main/kotlin/datadog/gradle/plugin/config/SupportedConfigPlugin.kt b/buildSrc/src/main/kotlin/datadog/gradle/plugin/config/SupportedConfigPlugin.kt
index 598d566bdf0..dd23dbbcd05 100644
--- a/buildSrc/src/main/kotlin/datadog/gradle/plugin/config/SupportedConfigPlugin.kt
+++ b/buildSrc/src/main/kotlin/datadog/gradle/plugin/config/SupportedConfigPlugin.kt
@@ -23,5 +23,9 @@ class SupportedConfigPlugin : Plugin<Project> {
     sourceset.configure {
       java.srcDir(generateTask)
     }
+
+    targetProject.tasks.named("javadoc") {
+      dependsOn(generateTask)
+    }
   }
 }
diff --git a/utils/config-utils/build.gradle.kts b/utils/config-utils/build.gradle.kts
index e77af1d50d0..301185f73c8 100644
--- a/utils/config-utils/build.gradle.kts
+++ b/utils/config-utils/build.gradle.kts
@@ -56,7 +56,3 @@ dependencies {
   testImplementation(project(":utils:test-utils"))
   testImplementation("org.snakeyaml:snakeyaml-engine:2.9")
 }
-
-tasks.named("javadoc") {
-  dependsOn("generateSupportedConfigurations")
-}