diff --git a/.ci/.e2e-tests-for-elastic-agent.yaml b/.ci/.e2e-tests-for-elastic-agent.yaml
index b2eb725924..16ab01b0c6 100644
--- a/.ci/.e2e-tests-for-elastic-agent.yaml
+++ b/.ci/.e2e-tests-for-elastic-agent.yaml
@@ -6,7 +6,7 @@ PLATFORMS:
     username: admin
   centos8_arm64:
     image: "ami-01cdc9e8306344fe0"
-    instance_type: "c5.4xlarge"
+    instance_type: "a1.large"
     username: centos
   centos8_amd64:
     image: "ami-045b0a05944af45c1"
diff --git a/.ci/.e2e-tests.yaml b/.ci/.e2e-tests.yaml
index a78f56f664..443ef14000 100644
--- a/.ci/.e2e-tests.yaml
+++ b/.ci/.e2e-tests.yaml
@@ -6,7 +6,7 @@ PLATFORMS:
     username: admin
   centos8_arm64:
     image: "ami-01cdc9e8306344fe0"
-    instance_type: "c5.4xlarge"
+    instance_type: "a1.large"
     username: centos
   centos8_amd64:
     image: "ami-045b0a05944af45c1"
diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile
index 973e670735..66ba9fe5eb 100644
--- a/.ci/Jenkinsfile
+++ b/.ci/Jenkinsfile
@@ -400,9 +400,9 @@ def checkTestSuite(Map parallelTasks = [:], Map item = [:]) {
     def pullRequestFilter = scenario.containsKey('pullRequestFilter') ? scenario.pullRequestFilter : ''
     def tags = scenario.tags
       platformsValue.each { platform ->
-        log(level: 'INFO', text: "Adding ${platform}:${suite}:${tags} test suite to the build execution")
+        log(level: 'INFO', text: "Adding ${suite}:${platform}:${tags} test suite to the build execution")
         machineInfo = getMachineInfo("${env.WORKSPACE}/${env.BASE_DIR}", platform)
-        parallelTasks["${platform}_${tags}"] = generateFunctionalTestStep(name: "${name}",
+        parallelTasks["${suite}_${platform}_${tags}"] = generateFunctionalTestStep(name: "${name}",
                                                                           platform: platform,
                                                                           suite: "${suite}",
                                                                           tags: "${tags}",