diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2206911cc1f00..5da31f01e3036 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_test_only:v53322313-e44a02c9
+      - image: gcr.io/datadoghq/agent-circleci-runner:v53408733-3b43fd22
         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 9ffb2fb300f8f..86a8bc7b6c7bd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -169,51 +169,51 @@ 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: "_test_only"
-  DATADOG_AGENT_BUILDIMAGES: v53322313-e44a02c9
-  DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: "_test_only"
-  DATADOG_AGENT_WINBUILDIMAGES: v53322313-e44a02c9
-  DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: "_test_only"
-  DATADOG_AGENT_ARMBUILDIMAGES: v53322313-e44a02c9
-  DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: "_test_only"
-  DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v53322313-e44a02c9
-  DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: "_test_only"
-  DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v53322313-e44a02c9
+  DATADOG_AGENT_BUILDIMAGES_SUFFIX: ""
+  DATADOG_AGENT_BUILDIMAGES: v53408733-3b43fd22
+  DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: ""
+  DATADOG_AGENT_WINBUILDIMAGES: v53408733-3b43fd22
+  DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: ""
+  DATADOG_AGENT_ARMBUILDIMAGES: v53408733-3b43fd22
+  DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: ""
+  DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v53408733-3b43fd22
+  DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: ""
+  DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v53408733-3b43fd22
   # New images to enable different version per image - not used yet
-  CI_IMAGE_BTF_GEN: v53322313-e44a02c9
-  CI_IMAGE_BTF_GEN_SUFFIX: "_test_only"
-  CI_IMAGE_DEB_X64: v53322313-e44a02c9
-  CI_IMAGE_DEB_X64_SUFFIX: "_test_only"
-  CI_IMAGE_DEB_ARM64: v53322313-e44a02c9
-  CI_IMAGE_DEB_ARM64_SUFFIX: "_test_only"
-  CI_IMAGE_DEB_ARMHF: v53322313-e44a02c9
-  CI_IMAGE_DEB_ARMHF_SUFFIX: "_test_only"
-  CI_IMAGE_DD_AGENT_TESTING: v53322313-e44a02c9
-  CI_IMAGE_DD_AGENT_TESTING_SUFFIX: "_test_only"
-  CI_IMAGE_DOCKER_X64: v53322313-e44a02c9
-  CI_IMAGE_DOCKER_X64_SUFFIX: "_test_only"
-  CI_IMAGE_DOCKER_ARM64: v53322313-e44a02c9
-  CI_IMAGE_DOCKER_ARM64_SUFFIX: "_test_only"
-  CI_IMAGE_GITLAB_AGENT_DEPLOY: v53322313-e44a02c9
-  CI_IMAGE_GITLAB_AGENT_DEPLOY_SUFFIX: "_test_only"
-  CI_IMAGE_LINUX_GLIBC_2_17_X64: v53322313-e44a02c9
-  CI_IMAGE_LINUX_GLIBC_2_17_X64_SUFFIX: "_test_only"
-  CI_IMAGE_LINUX_GLIBC_2_23_ARM64: v53322313-e44a02c9
-  CI_IMAGE_LINUX_GLIBC_2_23_ARM64_SUFFIX: "_test_only"
-  CI_IMAGE_SYSTEM_PROBE_X64: v53322313-e44a02c9
-  CI_IMAGE_SYSTEM_PROBE_X64_SUFFIX: "_test_only"
-  CI_IMAGE_SYSTEM_PROBE_ARM64: v53322313-e44a02c9
-  CI_IMAGE_SYSTEM_PROBE_ARM64_SUFFIX: "_test_only"
-  CI_IMAGE_RPM_X64: v53322313-e44a02c9
-  CI_IMAGE_RPM_X64_SUFFIX: "_test_only"
-  CI_IMAGE_RPM_ARM64: v53322313-e44a02c9
-  CI_IMAGE_RPM_ARM64_SUFFIX: "_test_only"
-  CI_IMAGE_RPM_ARMHF: v53322313-e44a02c9
-  CI_IMAGE_RPM_ARMHF_SUFFIX: "_test_only"
-  CI_IMAGE_WIN_1809_X64: v53322313-e44a02c9
-  CI_IMAGE_WIN_1809_X64_SUFFIX: "_test_only"
-  CI_IMAGE_WIN_LTSC2022_X64: v53322313-e44a02c9
-  CI_IMAGE_WIN_LTSC2022_X64_SUFFIX: "_test_only"
+  CI_IMAGE_BTF_GEN: v53408733-3b43fd22
+  CI_IMAGE_BTF_GEN_SUFFIX: ""
+  CI_IMAGE_DEB_X64: v53408733-3b43fd22
+  CI_IMAGE_DEB_X64_SUFFIX: ""
+  CI_IMAGE_DEB_ARM64: v53408733-3b43fd22
+  CI_IMAGE_DEB_ARM64_SUFFIX: ""
+  CI_IMAGE_DEB_ARMHF: v53408733-3b43fd22
+  CI_IMAGE_DEB_ARMHF_SUFFIX: ""
+  CI_IMAGE_DD_AGENT_TESTING: v53408733-3b43fd22
+  CI_IMAGE_DD_AGENT_TESTING_SUFFIX: ""
+  CI_IMAGE_DOCKER_X64: v53408733-3b43fd22
+  CI_IMAGE_DOCKER_X64_SUFFIX: ""
+  CI_IMAGE_DOCKER_ARM64: v53408733-3b43fd22
+  CI_IMAGE_DOCKER_ARM64_SUFFIX: ""
+  CI_IMAGE_GITLAB_AGENT_DEPLOY: v53408733-3b43fd22
+  CI_IMAGE_GITLAB_AGENT_DEPLOY_SUFFIX: ""
+  CI_IMAGE_LINUX_GLIBC_2_17_X64: v53408733-3b43fd22
+  CI_IMAGE_LINUX_GLIBC_2_17_X64_SUFFIX: ""
+  CI_IMAGE_LINUX_GLIBC_2_23_ARM64: v53408733-3b43fd22
+  CI_IMAGE_LINUX_GLIBC_2_23_ARM64_SUFFIX: ""
+  CI_IMAGE_SYSTEM_PROBE_X64: v53408733-3b43fd22
+  CI_IMAGE_SYSTEM_PROBE_X64_SUFFIX: ""
+  CI_IMAGE_SYSTEM_PROBE_ARM64: v53408733-3b43fd22
+  CI_IMAGE_SYSTEM_PROBE_ARM64_SUFFIX: ""
+  CI_IMAGE_RPM_X64: v53408733-3b43fd22
+  CI_IMAGE_RPM_X64_SUFFIX: ""
+  CI_IMAGE_RPM_ARM64: v53408733-3b43fd22
+  CI_IMAGE_RPM_ARM64_SUFFIX: ""
+  CI_IMAGE_RPM_ARMHF: v53408733-3b43fd22
+  CI_IMAGE_RPM_ARMHF_SUFFIX: ""
+  CI_IMAGE_WIN_1809_X64: v53408733-3b43fd22
+  CI_IMAGE_WIN_1809_X64_SUFFIX: ""
+  CI_IMAGE_WIN_LTSC2022_X64: v53408733-3b43fd22
+  CI_IMAGE_WIN_LTSC2022_X64_SUFFIX: ""
 
   DATADOG_AGENT_EMBEDDED_PATH: /opt/datadog-agent/embedded
   DEB_GPG_KEY_ID: c0962c7d