diff --git a/jenkins/jobs/capm3-e2e-tests.pipeline b/jenkins/jobs/capm3-e2e-tests.pipeline
index 57eb685e..e679574a 100644
--- a/jenkins/jobs/capm3-e2e-tests.pipeline
+++ b/jenkins/jobs/capm3-e2e-tests.pipeline
@@ -21,7 +21,10 @@ script {
   }
     echo "Checkout ${ci_git_url} branch ${ci_git_branch}"
 
-  if  ("${GINKGO_FOCUS}" == 'integration' || "${GINKGO_FOCUS}" == 'basic') {
+  if  ("${GINKGO_FOCUS}" == 'integration' || "${GINKGO_FOCUS}" == 'basic')  {
+    agent_label = "metal3ci-8c16gb-${IMAGE_OS}"
+    TIMEOUT=10800 // 3h
+  } else if  ("${GINKGO_FOCUS}" == 'k8s-upgrade') {
     agent_label = "metal3ci-8c16gb-${IMAGE_OS}"
     TIMEOUT=10800 // 3h
   } else if ( "${env.EPHEMERAL_TEST}" == 'true' ) {
diff --git a/jenkins/jobs/e2e_features_test.pipeline b/jenkins/jobs/e2e_features_test.pipeline
index 40e466ae..cb8a0786 100644
--- a/jenkins/jobs/e2e_features_test.pipeline
+++ b/jenkins/jobs/e2e_features_test.pipeline
@@ -25,14 +25,16 @@ script {
   if ("${GINKGO_FOCUS}" == 'pivoting') {
     BUILD_TAG = "${env.BUILD_TAG}-pivoting-based"
     TIMEOUT = 18000 // 5h for node reuse
+    agent_label="metal3ci-large-${IMAGE_OS}"
   } else if ("${GINKGO_FOCUS}" == 'remediation') {
     BUILD_TAG = "${env.BUILD_TAG}-remediation-based"
     TIMEOUT = 18000 // 5h for remediation
+    agent_label="metal3ci-large-${IMAGE_OS}"
   } else {
     BUILD_TAG = "${env.BUILD_TAG}-other-features"
     GINKGO_SKIP = "pivoting remediation" // Allow non pivoting features
+    agent_label="metal3ci-8c24gb-${IMAGE_OS}"
   }
-  agent_label="metal3ci-large-${IMAGE_OS}"
 }
 
 pipeline {