diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e68fed8144..a6daadd47a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,7 @@ stages:
 include:
   - remote: https://gitlab-templates.ddbuild.io/apm/packaging.yml
   - local: ".gitlab/benchmarks.yml"
-  - local: ".gitlab/onboarding_tests.yml"
+  - remote: https://gitlab-templates.ddbuild.io/libdatadog/include/single-step-instrumentation-tests.yml
 
 variables:
   DOWNSTREAM_BRANCH:
@@ -199,27 +199,19 @@ oci-internal-test-ecr-publish:
     IMG_REGISTRIES: agent-qa
 
 onboarding_tests:
-  extends: .base_job_onboarding_tests
+  extends: .base_job_onboarding
   stage: integration-tests
-  needs: [ package-amd64, package-arm64, oci-internal-test-ecr-publish]
+  needs: [ oci-internal-test-ecr-publish ]
   allow_failure: false
   variables:
     TEST_LIBRARY: ruby
-    ONBOARDING_FILTER_ENV: prod
+    SCENARIO: SIMPLE_INSTALLER_AUTO_INJECTION
+    DD_INSTALLER_LIBRARY_VERSION: pipeline-${CI_PIPELINE_ID}
   parallel:
       matrix:
-        - ONBOARDING_FILTER_WEBLOG: [test-app-ruby]
-          SCENARIO: [SIMPLE_HOST_AUTO_INJECTION]
-        - ONBOARDING_FILTER_WEBLOG: [test-app-ruby-container]
-          SCENARIO: [SIMPLE_CONTAINER_AUTO_INJECTION]
-        - ONBOARDING_FILTER_WEBLOG: [test-app-ruby,test-app-ruby-container]
-          SCENARIO: [INSTALLER_AUTO_INJECTION]
+        - ONBOARDING_FILTER_WEBLOG: [test-app-ruby, test-app-ruby-container]
   script:
     - git clone https://git@github.com/DataDog/system-tests.git system-tests
-    - cp packaging/*.rpm system-tests/binaries
-    - cp packaging/*.deb system-tests/binaries
-    - export DD_INSTALLER_LIBRARY_VERSION="pipeline-${CI_PIPELINE_ID}"
-    - ls system-tests/binaries
     - cd system-tests
     - ./build.sh -i runner
     - timeout 2700s ./run.sh $SCENARIO --vm-weblog ${ONBOARDING_FILTER_WEBLOG} --vm-env prod --vm-library ${TEST_LIBRARY} --vm-provider aws --vm-skip-branches ubuntu18_amd64
diff --git a/.gitlab/onboarding_tests.yml b/.gitlab/onboarding_tests.yml
deleted file mode 100644
index 1ad4471659..0000000000
--- a/.gitlab/onboarding_tests.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-.base_job_onboarding_tests:
-
-  image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/test-infra-definitions/runner:a58cc31c
-  tags: ["arch:amd64"]
-  before_script:
-    # Setup AWS Credentials for dd-trace-rb.
-    - mkdir -p ~/.aws
-    - aws ssm get-parameter --region us-east-1 --name ci.dd-trace-rb.agent-qa-profile --with-decryption --query "Parameter.Value" --out text >> ~/.aws/config
-    - export DD_API_KEY_ONBOARDING=$(aws ssm get-parameter --region us-east-1 --name ci.dd-trace-rb.dd-api-key-onboarding --with-decryption --query "Parameter.Value" --out text)
-    - export DD_APP_KEY_ONBOARDING=$(aws ssm get-parameter --region us-east-1 --name ci.dd-trace-rb.dd-app-key-onboarding --with-decryption --query "Parameter.Value" --out text)
-    - export ONBOARDING_AWS_INFRA_SUBNET_ID=$(aws ssm get-parameter --region us-east-1 --name ci.dd-trace-rb.aws-infra-subnet-id --with-decryption --query "Parameter.Value" --out text)
-    - export ONBOARDING_AWS_INFRA_SECURITY_GROUPS_ID=$(aws ssm get-parameter --region us-east-1 --name ci.dd-trace-rb.aws-infra-securiy-groups-id --with-decryption --query "Parameter.Value" --out text)
-    - export ONBOARDING_AWS_INFRA_IAM_INSTANCE_PROFILE=ec2InstanceRole
-    - export PULUMI_CONFIG_PASSPHRASE=$(aws ssm get-parameter --region us-east-1 --name ci.dd-trace-rb.pulumi-config-passphrase --with-decryption --query "Parameter.Value" --out text) 
-    #Install plugins for PULUMI you need connect to gh. Sometimes this problem arises: GitHub rate limit exceeded
-    - export GITHUB_TOKEN=$(aws ssm get-parameter --region us-east-1 --name ci.dd-trace-rb.gh-token --with-decryption --query "Parameter.Value" --out text) 
-    #Avoid dockerhub rate limits
-    - export DOCKER_LOGIN=$(aws ssm get-parameter --region us-east-1 --name ci.dd-trace-rb.docker-login --with-decryption --query "Parameter.Value" --out text) 
-    - export DOCKER_LOGIN_PASS=$(aws ssm get-parameter --region us-east-1 --name ci.dd-trace-rb.docker-login-pass --with-decryption --query "Parameter.Value" --out text) 
-    - export AWS_PROFILE=agent-qa-ci
-    - pulumi login --local #"s3://dd-pulumi-state?region=us-east-1&awssdk=v2&profile=$AWS_PROFILE"
-    - pulumi plugin install resource command 0.7.2
-    - pulumi plugin install resource aws 5.41.0
-
-  after_script:
-    - echo "After onboarding script"
-    - cd system-tests
-    - mkdir -p reports
-    - cp -R logs_*/ reports/
-  
-  artifacts:
-      when: always
-      paths:
-        - system-tests/reports/