diff --git a/.devcontainer/datadog/default/devcontainer.json b/.devcontainer/datadog/default/devcontainer.json
index ab4d462b620a..6f19013c221b 100644
--- a/.devcontainer/datadog/default/devcontainer.json
+++ b/.devcontainer/datadog/default/devcontainer.json
@@ -1,5 +1,5 @@
 // This devcontainer directs workspaces to use a pre-built image. To make
 // configuration changes, edit prebuild-devcontainer.json in this folder instead
 {
-    "image": "registry.ddbuild.io/workspaces/prebuilt/datadog/datadog-agent@sha256:23a853a5e181b86b01bb82f55c2b1fd35f3b614a52e2b1d5db27e2f057ec7948"
+    "image": "registry.ddbuild.io/workspaces/prebuilt/datadog/datadog-agent@sha256:c53bbbb1aff985d1caa57a576d22e068b0b7408d90af15519f2e3f72bd0824bf"
 }
diff --git a/.devcontainer/datadog/default/prebuild-devcontainer.json b/.devcontainer/datadog/default/prebuild-devcontainer.json
index 7b91b8491abe..dc916efc1f98 100644
--- a/.devcontainer/datadog/default/prebuild-devcontainer.json
+++ b/.devcontainer/datadog/default/prebuild-devcontainer.json
@@ -1,12 +1,14 @@
 {
     // Trigger build: 2026-06-30 23:25
     "name": "Datadog Agent Development Container",
-    "image": "registry.ddbuild.io/ci/datadog-agent-buildimages/dev-env-workspace:v124282699-89230a57",
+    "image": "registry.ddbuild.io/ci/datadog-agent-buildimages/dev-env-workspace_test_only:v125311220-9d18ca16",
     "features": {
         "registry.ddbuild.io/workspaces/features/claude-code:0.1.122114922": {},
         "registry.ddbuild.io/workspaces/features/trajectory:0.1.121704661": {},
         "registry.ddbuild.io/workspaces/features/codex:0.1.116595837": {},
-        "registry.ddbuild.io/workspaces/features/base:0.4.116964598": {},
+        "registry.ddbuild.io/workspaces/features/base:0.4.0-agent-base-feature-poc.20260714": {
+            "installDeveloperTools": false
+        },
         "./features/datadog-agent": {}
     },
     "forwardPorts": [22],