diff --git a/airbyte-container-orchestrator/Dockerfile b/airbyte-container-orchestrator/Dockerfile
index dda3e64a4c8e..79066eb582e5 100644
--- a/airbyte-container-orchestrator/Dockerfile
+++ b/airbyte-container-orchestrator/Dockerfile
@@ -1,5 +1,5 @@
-ARG JDK_VERSION=17.0.4
-ARG JDK_IMAGE=amazoncorretto:${JDK_VERSION}
+ARG JDK_VERSION=3.1
+ARG JDK_IMAGE=airbyte/java-datadog-tracer-base:${JDK_VERSION}
 FROM ${JDK_IMAGE} AS orchestrator
 
 ARG DOCKER_BUILD_ARCH=amd64
diff --git a/airbyte-cron/Dockerfile b/airbyte-cron/Dockerfile
index 2ab053d151bf..2599edccea63 100644
--- a/airbyte-cron/Dockerfile
+++ b/airbyte-cron/Dockerfile
@@ -1,5 +1,5 @@
-ARG JDK_VERSION=17.0.4
-ARG JDK_IMAGE=amazoncorretto:${JDK_VERSION}
+ARG JDK_VERSION=3.1
+ARG JDK_IMAGE=airbyte/java-datadog-tracer-base:${JDK_VERSION}
 FROM ${JDK_IMAGE} AS cron
 
 ARG VERSION=0.40.12
diff --git a/airbyte-workers/Dockerfile b/airbyte-workers/Dockerfile
index 835a8c4d146e..adf25c20aeb7 100644
--- a/airbyte-workers/Dockerfile
+++ b/airbyte-workers/Dockerfile
@@ -1,5 +1,5 @@
-ARG JDK_VERSION=17.0.4
-ARG JDK_IMAGE=amazoncorretto:${JDK_VERSION}
+ARG JDK_VERSION=3.1
+ARG JDK_IMAGE=airbyte/java-datadog-tracer-base:${JDK_VERSION}
 FROM ${JDK_IMAGE} AS worker
 
 ARG DOCKER_BUILD_ARCH=amd64