diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9009e782..456fabe0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -358,25 +358,31 @@ trigger_build_kernels:
       - local: .gitlab/kernel_version_testing.yml
     strategy: depend
 
-trigger_tests:
+generate_datadog_agent_trigger:
   stage: test
-  rules:
-    - when: manual
-      allow_failure: true
+  tags: ["arch:arm64"]
+  image: registry.ddbuild.io/images/mirror/ubuntu:latest
+  when: manual
+  allow_failure: true
   variables:
-    RUN_KITCHEN_TESTS: "false"
-    BUCKET_BRANCH: "dev"
-    DATADOG_AGENT_BUILDIMAGES: "v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}"
-    DATADOG_AGENT_BUILDIMAGES_SUFFIX: "${ECR_TEST_ONLY}"
-    DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: "${ECR_TEST_ONLY}"
-    DATADOG_AGENT_WINBUILDIMAGES: "v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}"
-    DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: "${ECR_TEST_ONLY}"
-    DATADOG_AGENT_ARMBUILDIMAGES: "v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}"
-    DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: "${ECR_TEST_ONLY}"
-    DATADOG_AGENT_SYSPROBE_BUILDIMAGES: "v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}"
+    GIT_BRANCH: main
+  script:
+    - |
+      sed -i -e "s/CI_PIPELINE_ID/${CI_PIPELINE_ID}/g" \
+             -e "s/CI_COMMIT_SHORT_SHA/${CI_COMMIT_SHORT_SHA}/g" \
+             -e "s/ECR_TEST_ONLY/${ECR_TEST_ONLY}/g" \
+             -e "s/GIT_BRANCH/${GIT_BRANCH}/g" .gitlab/trigger_datadog_agent.yml
+  artifacts:
+    paths:
+      - .gitlab/trigger_datadog_agent.yml
+
+trigger_datadog_agent_pipeline:
+  stage: test
+  needs: ["generate_datadog_agent_trigger"]
   trigger:
-    project: DataDog/datadog-agent
-    strategy: depend
+    include:
+      - artifact: .gitlab/trigger_datadog_agent.yml
+        job: generate_datadog_agent_trigger
 
 push_to_datadog_agent:
   stage: test
diff --git a/.gitlab/trigger_datadog_agent.yml b/.gitlab/trigger_datadog_agent.yml
new file mode 100644
index 00000000..f607b913
--- /dev/null
+++ b/.gitlab/trigger_datadog_agent.yml
@@ -0,0 +1,17 @@
+---
+trigger_datadog_agent:
+  variables:
+    RUN_KITCHEN_TESTS: "false"
+    BUCKET_BRANCH: "dev"
+    DATADOG_AGENT_BUILDIMAGES: "vCI_PIPELINE_ID-CI_COMMIT_SHORT_SHA"
+    DATADOG_AGENT_BUILDIMAGES_SUFFIX: "ECR_TEST_ONLY"
+    DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: "ECR_TEST_ONLY"
+    DATADOG_AGENT_WINBUILDIMAGES: "vCI_PIPELINE_ID-CI_COMMIT_SHORT_SHA"
+    DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: "ECR_TEST_ONLY"
+    DATADOG_AGENT_ARMBUILDIMAGES: "vCI_PIPELINE_ID-CI_COMMIT_SHORT_SHA"
+    DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: "ECR_TEST_ONLY"
+    DATADOG_AGENT_SYSPROBE_BUILDIMAGES: "vCI_PIPELINE_ID-CI_COMMIT_SHORT_SHA"
+  trigger:
+    project: DataDog/datadog-agent
+    branch: GIT_BRANCH
+    strategy: depend