diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b59bcd75f..ca864a214 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,27 +28,25 @@ build_tools:
       when: never
     - changes:
       - build-tools/**/*
-  tags: ["runner:docker"]
+  tags: ["arch:amd64"]
   script:
-    - cd build-tools && docker buildx build --tag ${TARGET} --push .
+    - cd build-tools && docker buildx build --tag ${TARGET}:testing-new-ci-image --push .
 
 build_and_deploy_layer:
   stage: build_layer
   rules:
     - if: $CI_PIPELINE_SOURCE == "web"
   variables:
-    CI_ENABLE_CONTAINER_IMAGE_BUILDS: "true"
     ROLE_TO_ASSUME: arn:aws:iam::425362996713:role/sandbox-layer-deployer
-    TARGET: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-lambda-extension
-  tags: ["runner:docker"]
+    TARGET: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-lambda-extension:testing-new-ci-image 
+  tags: ["arch:amd64"]
+  image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-lambda-extension:testing-new-ci-image 
   artifacts:
     paths:
       - tmp/serverless/datadog_extension_signed.zip
   script:
     - mkdir tmp
     - git clone --branch ${AGENT_BRANCH} --depth=1 https://github.com/DataDog/datadog-agent.git
-    - dockerId=$(docker create --platform linux/amd64 ${TARGET})
-    - docker cp $dockerId:/build_tools .
     - EXTERNAL_ID=$(aws ssm get-parameter 
       --region us-east-1 
       --name ci.datadog-lambda-extension.externalid 
@@ -57,7 +55,7 @@ build_and_deploy_layer:
       --out text)
 
     # build
-    - ./build_tools
+    - build_tools
       build
       --version 1
       --agent-version 1
@@ -68,7 +66,7 @@ build_and_deploy_layer:
       --artifact-name "datadog_extension.zip"
 
     # sign
-    - ./build_tools
+    - build_tools
       sign 
       --layer-path tmp/serverless/datadog_extension.zip 
       --destination-path tmp/serverless/datadog_extension_signed.zip 
@@ -80,7 +78,7 @@ build_and_deploy_layer:
 
     # deploy to single region if needed
     - if [ "${REGION_TO_DEPLOY}" = "all" ]; then exit 0; fi
-    - ./build_tools
+    - build_tools
       deploy
       --layer-path tmp/serverless/datadog_extension_signed.zip
       --architecture amd64
@@ -92,7 +90,7 @@ build_and_deploy_layer:
 
 prepare_multi_region:
   stage: prepare_multi_region
-  tags: ["runner:docker"]
+  tags: ["arch:amd64"]
   artifacts:
     paths:
       - trigger_region.yaml
diff --git a/build-tools/Dockerfile b/build-tools/Dockerfile
index bad54e180..ef1e5da6b 100644
--- a/build-tools/Dockerfile
+++ b/build-tools/Dockerfile
@@ -5,6 +5,5 @@ COPY Cargo.lock .
 COPY src ./src
 RUN cargo build --release
 
-FROM scratch
-COPY --from=builder /usr/src/app/target/release/build_tools /build_tools
-ENTRYPOINT ["/build_tools"]
\ No newline at end of file
+FROM 486234852809.dkr.ecr.us-east-1.amazonaws.com/docker:20.10-py3
+COPY --from=builder /usr/src/app/target/release/build_tools /usr/local/bin/
diff --git a/build-tools/src/commands/build_command.rs b/build-tools/src/commands/build_command.rs
index b158d4359..f4b068f52 100644
--- a/build-tools/src/commands/build_command.rs
+++ b/build-tools/src/commands/build_command.rs
@@ -42,10 +42,10 @@ fn build_extension(cmd_path: &str, args: &BuildOptions) -> Result<()> {
     let destination_path = &args.destination_path;
     let dockerfile_path = &args.docker_path;
     let image_name = build_image(args, cmd_path, dockerfile_path.as_str())?;
-    let docker_container_id = create_container(image_name.as_str())?;
-    std::fs::create_dir(destination_path)?;
-    copy_zip_file(args, docker_container_id.as_str(), destination_path)?;
-    remove_container(&docker_container_id)?;
+    // let docker_container_id = create_container(image_name.as_str())?;
+    // std::fs::create_dir(destination_path)?;
+    // copy_zip_file(args, docker_container_id.as_str(), destination_path)?;
+    // remove_container(&docker_container_id)?;
     Ok(())
 }
 
diff --git a/build-tools/to_remove b/build-tools/to_remove
new file mode 100644
index 000000000..3091bc795
--- /dev/null
+++ b/build-tools/to_remove
@@ -0,0 +1 @@
+trigger build-tools gitlab to validate tag change
\ No newline at end of file