diff --git a/.env b/.env
index b2bbebe9be..d534ccad91 100644
--- a/.env
+++ b/.env
@@ -1,8 +1,10 @@
 SKIP_SIMPLECOV=1
-DD_AGENT_HOST=testagent
+# DD_AGENT_HOST=testagent
+DD_AGENT_HOST=catadog
 DD_API_KEY=00000000000000000000000000000000
 DD_METRIC_AGENT_PORT=8125
-DD_TRACE_AGENT_PORT=9126
+# DD_TRACE_AGENT_PORT=9126
+DD_TRACE_AGENT_PORT=8128
 
 # Values are used for proxying from APM Test Agent to real Datadog Agent
 DD_REAL_AGENT_HOST=ddagent
diff --git a/docker-compose.yml b/docker-compose.yml
index a87492ea8d..7d5059b1d9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,11 +13,14 @@ services:
       - presto
       - redis
       - testagent
+      - catadog
     env_file: ./.env
     environment: &common-environment
       BUNDLE_GEMFILE: /app/Gemfile-2.5
-      DD_AGENT_HOST: testagent
-      DD_TRACE_AGENT_PORT: 9126
+      # DD_AGENT_HOST: testagent
+      DD_AGENT_HOST: catadog
+      # DD_TRACE_AGENT_PORT: 9126
+      DD_TRACE_AGENT_PORT: 8128
       TEST_DATADOG_INTEGRATION: 1
       TEST_ELASTICSEARCH_HOST: elasticsearch
       TEST_MEMCACHED_HOST: memcached
@@ -201,13 +204,23 @@ services:
       - "127.0.0.1:${DD_REAL_AGENT_PORT}:8126"
     volumes:
       - ddagent_var_run:/var/run/datadog
+  catadog:
+    image: ghcr.io/datadog/catadog:latest
+    command: --agent-host ddagent
+    depends_on:
+      - ddagent
+    ports:
+      - "8128:8128"
+    volumes:
+      - ./records:/app/records
 
   testagent:
     image: ghcr.io/datadog/dd-apm-test-agent/ddapm-test-agent:v1.12.0
     ports:
         - "127.0.0.1:${DD_TRACE_AGENT_PORT}:9126"
     depends_on:
-      - ddagent
+      # - ddagent
+      - catadog
     env_file: ./.env
     environment:
         - LOG_LEVEL=DEBUG