diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 9e05eb0..b4b616a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -70,7 +70,11 @@ slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
 testcontainers = { module = "org.testcontainers:testcontainers", version.ref = "testcontainers" }
 testcontainers-postgres = { module = "org.testcontainers:postgresql", version.ref = "testcontainers" }
 
+# Bug with dagger 2.56 https://github.com/google/dagger/issues/4624#issuecomment-2745326384
+javapoet = { module = "com.squareup:kotlinpoet-javapoet", version = "2.1.0" }
+
 [bundles]
+dagger-annotation = ['javapoet', 'dagger-compiler']
 jackson = ['jackson-dataformat-yaml']
 logback = ['logback-classic', 'logback-core']
 testing = ["mockito-core", "mockito-junit-jupiter", "assertj", "junit-jupiter"]
diff --git a/local-queue/build.gradle.kts b/local-queue/build.gradle.kts
index 24df872..678ccfd 100644
--- a/local-queue/build.gradle.kts
+++ b/local-queue/build.gradle.kts
@@ -16,7 +16,7 @@ dependencies {
 
     implementation(libs.javax.inject)
     implementation(libs.dagger)
-    annotationProcessor(libs.dagger.compiler)
+    annotationProcessor(libs.bundles.dagger.annotation)
     implementation(libs.immutables.annotations)
     annotationProcessor(libs.immutables.value)
 
@@ -32,7 +32,7 @@ dependencies {
     testImplementation(libs.bundles.testing)
     testImplementation(project(":codehead-test"))
     testImplementation(project(":metrics-test"))
-    testAnnotationProcessor(libs.dagger.compiler)
+    testAnnotationProcessor(libs.bundles.dagger.annotation)
     testAnnotationProcessor(libs.immutables.value)
 }
 
diff --git a/oop-mock-client/build.gradle.kts b/oop-mock-client/build.gradle.kts
index 0897f10..2b56970 100644
--- a/oop-mock-client/build.gradle.kts
+++ b/oop-mock-client/build.gradle.kts
@@ -11,13 +11,13 @@ dependencies {
     implementation(libs.commons.io)
 
     implementation(libs.dagger)
-    annotationProcessor(libs.dagger.compiler)
+    annotationProcessor(libs.bundles.dagger.annotation)
     implementation(libs.immutables.annotations)
     annotationProcessor(libs.immutables.value )
 
     testAnnotationProcessor(libs.immutables.value)
     testImplementation(libs.bundles.testing)
     testImplementation(libs.bundles.logback)
-    testAnnotationProcessor(libs.dagger.compiler)
+    testAnnotationProcessor(libs.bundles.dagger.annotation)
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
diff --git a/oop-mock-common/build.gradle.kts b/oop-mock-common/build.gradle.kts
index 318c31b..2c62a3c 100644
--- a/oop-mock-common/build.gradle.kts
+++ b/oop-mock-common/build.gradle.kts
@@ -10,14 +10,14 @@ dependencies {
     implementation(libs.commons.io)
 
     implementation(libs.dagger)
-    annotationProcessor(libs.dagger.compiler)
+    annotationProcessor(libs.bundles.dagger.annotation)
     implementation(libs.immutables.annotations)
     annotationProcessor(libs.immutables.value )
 
     testAnnotationProcessor(libs.immutables.value)
     testImplementation(libs.bundles.testing)
     testImplementation(libs.bundles.logback)
-    testAnnotationProcessor(libs.dagger.compiler)
+    testAnnotationProcessor(libs.bundles.dagger.annotation)
     testImplementation(project(":codehead-test"))
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
diff --git a/oop-mock-dynamodb/build.gradle.kts b/oop-mock-dynamodb/build.gradle.kts
index e660627..fe4d5f4 100644
--- a/oop-mock-dynamodb/build.gradle.kts
+++ b/oop-mock-dynamodb/build.gradle.kts
@@ -15,14 +15,14 @@ dependencies {
     implementation(libs.aws.sdk.ddb)
 
     implementation(libs.dagger)
-    annotationProcessor(libs.dagger.compiler)
+    annotationProcessor(libs.bundles.dagger.annotation)
     implementation(libs.immutables.annotations)
     annotationProcessor(libs.immutables.value )
 
     testAnnotationProcessor(libs.immutables.value)
     testImplementation(libs.bundles.testing)
     testImplementation(libs.bundles.logback)
-    testAnnotationProcessor(libs.dagger.compiler)
+    testAnnotationProcessor(libs.bundles.dagger.annotation)
     testImplementation(project(":oop-mock-tests"))
     testImplementation(project(":codehead-test"))
     testImplementation(project(":database-test"))
diff --git a/oop-mock-tests/build.gradle.kts b/oop-mock-tests/build.gradle.kts
index c2b0eed..1729b48 100644
--- a/oop-mock-tests/build.gradle.kts
+++ b/oop-mock-tests/build.gradle.kts
@@ -16,7 +16,7 @@ dependencies {
     implementation(libs.commons.io)
 
     implementation(libs.dagger)
-    annotationProcessor(libs.dagger.compiler)
+    annotationProcessor(libs.bundles.dagger.annotation)
     implementation(libs.immutables.annotations)
     annotationProcessor(libs.immutables.value )
 
diff --git a/oop-mock/build.gradle.kts b/oop-mock/build.gradle.kts
index 0897f10..2b56970 100644
--- a/oop-mock/build.gradle.kts
+++ b/oop-mock/build.gradle.kts
@@ -11,13 +11,13 @@ dependencies {
     implementation(libs.commons.io)
 
     implementation(libs.dagger)
-    annotationProcessor(libs.dagger.compiler)
+    annotationProcessor(libs.bundles.dagger.annotation)
     implementation(libs.immutables.annotations)
     annotationProcessor(libs.immutables.value )
 
     testAnnotationProcessor(libs.immutables.value)
     testImplementation(libs.bundles.testing)
     testImplementation(libs.bundles.logback)
-    testAnnotationProcessor(libs.dagger.compiler)
+    testAnnotationProcessor(libs.bundles.dagger.annotation)
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }