diff --git a/.circleci/config.yml b/.circleci/config.yml
index 253550ce7a7743..06302b3a2c0ee7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -15,7 +15,7 @@ experimental:
 templates:
   job_template: &job_template
     docker:
-      - image: gcr.io/datadoghq/agent-circleci-runner:v49173584-da48ad73
+      - image: gcr.io/datadoghq/agent-circleci-runner_test_only:v51588231-cc59f87a
         environment:
           USE_SYSTEM_LIBS: "1"
     working_directory: /go/src/github.com/DataDog/datadog-agent
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d30592dcde0600..361863cdeaa82e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -155,20 +155,20 @@ variables:
   # Build images versions
   # To use images from datadog-agent-buildimages dev branches, set the corresponding
   # SUFFIX variable to _test_only
-  DATADOG_AGENT_BUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_BUILDIMAGES: v49173584-da48ad73
-  DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_WINBUILDIMAGES: v49173584-da48ad73
-  DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_ARMBUILDIMAGES: v49173584-da48ad73
-  DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v49173584-da48ad73
-  DATADOG_AGENT_KERNEL_MATRIX_TESTING_BUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_KERNEL_MATRIX_TESTING_BUILDIMAGES: v49173584-da48ad73
-  DATADOG_AGENT_NIKOS_BUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_NIKOS_BUILDIMAGES: v49173584-da48ad73
-  DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v49173584-da48ad73
+  DATADOG_AGENT_BUILDIMAGES_SUFFIX: "_test_only"
+  DATADOG_AGENT_BUILDIMAGES: v51588231-cc59f87a
+  DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: "_test_only"
+  DATADOG_AGENT_WINBUILDIMAGES: v51588231-cc59f87a
+  DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: "_test_only"
+  DATADOG_AGENT_ARMBUILDIMAGES: v51588231-cc59f87a
+  DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: "_test_only"
+  DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v51588231-cc59f87a
+  DATADOG_AGENT_KERNEL_MATRIX_TESTING_BUILDIMAGES_SUFFIX: "_test_only"
+  DATADOG_AGENT_KERNEL_MATRIX_TESTING_BUILDIMAGES: v51588231-cc59f87a
+  DATADOG_AGENT_NIKOS_BUILDIMAGES_SUFFIX: "_test_only"
+  DATADOG_AGENT_NIKOS_BUILDIMAGES: v51588231-cc59f87a
+  DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: "_test_only"
+  DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v51588231-cc59f87a
   # To use images from test-infra-definitions dev branches, set the SUFFIX variable to -dev
   # and check the job creating the image to make sure you have the right SHA prefix
   TEST_INFRA_DEFINITIONS_BUILDIMAGES_SUFFIX: ""