diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5e194789..daa39c9f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,6 @@ variables:
   CI_IMAGE_DOCKER: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/dd-sdk-android-gradle-plugin:$CURRENT_CI_IMAGE
   GIT_DEPTH: 5
 
-  DD_AGENT_HOST: "$BUILDENV_HOST_IP"
   DD_SERVICE: "dd-sdk-android-gradle-plugin"
   DD_ENV_TESTS: "ci"
   DD_INTEGRATION_JUNIT_5_ENABLED: "true"
@@ -29,7 +28,7 @@ ci-image:
   stage: ci-image
   when: manual
   except: [ tags, schedules ]
-  tags: [ "runner:docker" ]
+  tags: [ "arch:amd64" ]
   image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/docker:24.0.4-gbi-focal
   script:
     - docker build --tag $CI_IMAGE_DOCKER -f Dockerfile.gitlab .
@@ -40,7 +39,7 @@ ci-image:
 create_key:
   stage: security
   when: manual
-  tags: [ "runner:docker" ]
+  tags: [ "arch:amd64" ]
   variables:
     PROJECT_NAME: "dd-sdk-android-gradle-plugin"
     EXPORT_TO_KEYSERVER: "true"
@@ -63,7 +62,7 @@ static-analysis:
     strategy: depend
 
 analysis:licenses:
-  tags: [ "runner:main" ]
+  tags: [ "arch:amd64" ]
   image: $CI_IMAGE_DOCKER
   stage: analysis
   timeout: 30m
@@ -72,7 +71,7 @@ analysis:licenses:
     - GRADLE_OPTS="-Xmx2560m" ./gradlew :dd-sdk-android-gradle-plugin:checkThirdPartyLicences --stacktrace --no-daemon
 
 analysis:woke:
-  tags: [ "runner:main" ]
+  tags: [ "arch:amd64" ]
   image: $CI_IMAGE_DOCKER
   stage: analysis
   timeout: 30m
@@ -83,7 +82,7 @@ analysis:woke:
 # TESTS
 
 test:plugin:
-  tags: [ "runner:main" ]
+  tags: [ "arch:amd64" ]
   image: $CI_IMAGE_DOCKER
   stage: test
   timeout: 1h
@@ -91,6 +90,7 @@ test:plugin:
     - git fetch --depth=1 origin main
     - rm -rf ~/.gradle/daemon/
     - CODECOV_TOKEN=$(aws ssm get-parameter --region us-east-1 --name ci.dd-sdk-android-gradle-plugin.codecov-token --with-decryption --query "Parameter.Value" --out text)
+    - export DD_AGENT_HOST="$BUILDENV_HOST_IP"
     - GRADLE_OPTS="-Xmx2560m" ./gradlew :dd-sdk-android-gradle-plugin:test --stacktrace --no-daemon
     - bash <(cat ./codecov.sh) -t $CODECOV_TOKEN
   artifacts:
@@ -100,7 +100,7 @@ test:plugin:
 # PUBLISH ARTIFACTS
 
 publish:publish-sonatype:
-  tags: [ "runner:main" ]
+  tags: [ "arch:amd64" ]
   only:
     - tags
   image: $CI_IMAGE_DOCKER
@@ -116,7 +116,7 @@ publish:publish-sonatype:
     - ./gradlew :dd-sdk-android-gradle-plugin:publishPluginMavenPublicationToMavenRepository --stacktrace --no-daemon
 
 publish:publish-gradle-portal:
-  tags: [ "runner:main" ]
+  tags: [ "arch:amd64" ]
   only:
     - tags
   image: $CI_IMAGE_DOCKER