diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index da8ffd29fc2..b027da64e23 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -456,22 +456,9 @@ requirements_json_test:
 package-oci:
   needs: [ build ]
 
-onboarding_tests_installer:
-  parallel:
-    matrix:
-      - ONBOARDING_FILTER_WEBLOG: [test-app-java, test-app-java-container, test-app-java-alpine]
-        SCENARIO: [ SIMPLE_INSTALLER_AUTO_INJECTION, SIMPLE_AUTO_INJECTION_PROFILING ]
-
-onboarding_tests_k8s_injection:
-  parallel:
-    matrix:
-      - WEBLOG_VARIANT: [dd-lib-java-init-test-app]
-        SCENARIO: [K8S_LIB_INJECTION, K8S_LIB_INJECTION_UDS, K8S_LIB_INJECTION_NO_AC, K8S_LIB_INJECTION_NO_AC_UDS, K8S_LIB_INJECTION_PROFILING_DISABLED, K8S_LIB_INJECTION_PROFILING_ENABLED, K8S_LIB_INJECTION_PROFILING_OVERRIDE]
-        K8S_CLUSTER_VERSION: ['7.56.2', '7.57.0', '7.59.0']
-
-      - WEBLOG_VARIANT: [dd-djm-spark-test-app]
-        SCENARIO: [K8S_LIB_INJECTION_SPARK_DJM]
-        K8S_CLUSTER_VERSION: ['7.57.0', '7.59.0']
+configure_system_tests:
+  variables:
+    SYSTEM_TESTS_SCENARIOS_GROUPS: "simple_onboarding,simple_onboarding_profiling,docker-ssi,lib-injection"
 
 create_key:
   stage: generate-signing-key