diff --git a/config/jobs/kubernetes/kops/build_jobs.py b/config/jobs/kubernetes/kops/build_jobs.py
index bccf93e9814e..8fba44183274 100644
--- a/config/jobs/kubernetes/kops/build_jobs.py
+++ b/config/jobs/kubernetes/kops/build_jobs.py
@@ -385,12 +385,7 @@ def presubmit_test(branch='master',
     tmpl_file = "presubmit.yaml.jinja"
     if scenario is not None:
         tmpl_file = "presubmit-scenario.yaml.jinja"
-        name_hash = hashlib.md5(name.encode()).hexdigest()
         env['CLOUD_PROVIDER'] = cloud
-        if cloud == "aws":
-            env['CLUSTER_NAME'] = f"e2e-{name_hash[0:10]}-{name_hash[11:16]}.tests-kops-aws.k8s.io"
-        if 'KOPS_STATE_STORE' not in env and cloud == "aws":
-            env['KOPS_STATE_STORE'] = 's3://k8s-kops-ci-prow-state-store'
         if extra_flags:
             env['KOPS_EXTRA_FLAGS'] = " ".join(extra_flags)
         if irsa and cloud == "aws":
@@ -1582,7 +1577,6 @@ def generate_presubmits_scale():
             networking='amazonvpc',
             always_run=False,
             optional=True,
-            artifacts='$(ARTIFACTS)',
             test_timeout_minutes=450,
             use_preset_for_account_creds='preset-aws-credential-boskos-scale-001-kops',
             env={
@@ -1594,7 +1588,6 @@ def generate_presubmits_scale():
                 'NODE_MODE': "master",
                 'CONTROL_PLANE_COUNT': "3",
                 'CONTROL_PLANE_SIZE': "c8a.24xlarge",
-                'KOPS_STATE_STORE' : "s3://k8s-infra-kops-scale-tests",
                 'PROMETHEUS_SCRAPE_KUBE_PROXY': "true",
                 'CL2_ENABLE_DNS_PROGRAMMING': "true",
                 'CL2_ENABLE_API_AVAILABILITY_MEASUREMENT': "true",
@@ -1617,7 +1610,6 @@ def generate_presubmits_scale():
             # only helps with setting the right anotation test.kops.k8s.io/networking
             networking='amazonvpc',
             always_run=False,
-            artifacts='$(ARTIFACTS)',
             test_timeout_minutes=450,
             use_preset_for_account_creds='preset-aws-credential-boskos-scale-001-kops',
             env={
@@ -1630,7 +1622,6 @@ def generate_presubmits_scale():
                 'CL2_DELETE_TEST_THROUGHPUT': "50",
                 'CL2_RATE_LIMIT_POD_CREATION': "false",
                 'NODE_MODE': "master",
-                'KOPS_STATE_STORE' : "s3://k8s-infra-kops-scale-tests",
                 'PROMETHEUS_SCRAPE_KUBE_PROXY': "true",
                 'CL2_ENABLE_DNS_PROGRAMMING': "true",
                 'CL2_ENABLE_API_AVAILABILITY_MEASUREMENT': "true",
@@ -1651,7 +1642,6 @@ def generate_presubmits_scale():
             networking='gce',
             cloud="gce",
             always_run=False,
-            artifacts='$(ARTIFACTS)',
             test_timeout_minutes=450,
             env={
                 'CNI_PLUGIN': "gce",
@@ -1687,7 +1677,6 @@ def generate_presubmits_scale():
             cloud="gce",
             always_run=False,
             run_if_changed=r'^tests\/e2e\/scenarios\/scalability\/run-test.sh',
-            artifacts='$(ARTIFACTS)',
             test_timeout_minutes=450,
             env={
                 'CNI_PLUGIN': "gce",
@@ -1721,7 +1710,6 @@ def generate_presubmits_scale():
             networking='gce',
             cloud="gce",
             always_run=False,
-            artifacts='$(ARTIFACTS)',
             test_timeout_minutes=450,
             env={
                 'CNI_PLUGIN': "kindnet",
diff --git a/config/jobs/kubernetes/kops/kops-presubmits-e2e.yaml b/config/jobs/kubernetes/kops/kops-presubmits-e2e.yaml
index 9b320bb78377..44649579196a 100644
--- a/config/jobs/kubernetes/kops/kops-presubmits-e2e.yaml
+++ b/config/jobs/kubernetes/kops/kops-presubmits-e2e.yaml
@@ -1049,10 +1049,6 @@ presubmits:
           value: /home/prow/go
         - name: CLOUD_PROVIDER
           value: "aws"
-        - name: CLUSTER_NAME
-          value: "e2e-93386f3fd4-07e7d.tests-kops-aws.k8s.io"
-        - name: KOPS_STATE_STORE
-          value: "s3://k8s-kops-ci-prow-state-store"
         - name: KOPS_IRSA
           value: "true"
         resources:
@@ -1108,10 +1104,6 @@ presubmits:
           value: /home/prow/go
         - name: CLOUD_PROVIDER
           value: "aws"
-        - name: CLUSTER_NAME
-          value: "e2e-12ade267b4-0e701.tests-kops-aws.k8s.io"
-        - name: KOPS_STATE_STORE
-          value: "s3://k8s-kops-ci-prow-state-store"
         - name: KOPS_IRSA
           value: "true"
         resources:
@@ -1167,10 +1159,6 @@ presubmits:
           value: /home/prow/go
         - name: CLOUD_PROVIDER
           value: "aws"
-        - name: CLUSTER_NAME
-          value: "e2e-8851f75f16-e46fe.tests-kops-aws.k8s.io"
-        - name: KOPS_STATE_STORE
-          value: "s3://k8s-kops-ci-prow-state-store"
         - name: KOPS_IRSA
           value: "true"
         resources:
@@ -2158,10 +2146,6 @@ presubmits:
           value: /home/prow/go
         - name: CLOUD_PROVIDER
           value: "aws"
-        - name: CLUSTER_NAME
-          value: "e2e-d3f5571021-549a1.tests-kops-aws.k8s.io"
-        - name: KOPS_STATE_STORE
-          value: "s3://k8s-kops-ci-prow-state-store"
         - name: KOPS_IRSA
           value: "true"
         resources:
@@ -2217,10 +2201,6 @@ presubmits:
           value: /home/prow/go
         - name: CLOUD_PROVIDER
           value: "aws"
-        - name: CLUSTER_NAME
-          value: "e2e-48dc55eb73-6d49e.tests-kops-aws.k8s.io"
-        - name: KOPS_STATE_STORE
-          value: "s3://k8s-kops-ci-prow-state-store"
         - name: KOPS_IRSA
           value: "true"
         resources:
@@ -2278,10 +2258,6 @@ presubmits:
           value: "--ipv6 --topology=private --bastion"
         - name: CLOUD_PROVIDER
           value: "aws"
-        - name: CLUSTER_NAME
-          value: "e2e-e39f237b8c-e17ad.tests-kops-aws.k8s.io"
-        - name: KOPS_STATE_STORE
-          value: "s3://k8s-kops-ci-prow-state-store"
         - name: KOPS_IRSA
           value: "true"
         resources:
@@ -2352,10 +2328,6 @@ presubmits:
           value: "3"
         - name: CLOUD_PROVIDER
           value: "aws"
-        - name: CLUSTER_NAME
-          value: "e2e-1727ac1946-2023e.tests-kops-aws.k8s.io"
-        - name: KOPS_STATE_STORE
-          value: "s3://k8s-kops-ci-prow-state-store"
         - name: KOPS_IRSA
           value: "true"
         resources:
@@ -2410,10 +2382,6 @@ presubmits:
           value: /home/prow/go
         - name: CLOUD_PROVIDER
           value: "aws"
-        - name: CLUSTER_NAME
-          value: "e2e-fc5e1ab149-22fa7.tests-kops-aws.k8s.io"
-        - name: KOPS_STATE_STORE
-          value: "s3://k8s-kops-ci-prow-state-store"
         - name: KOPS_IRSA
           value: "true"
         resources:
diff --git a/config/jobs/kubernetes/kops/kops-presubmits-scale.yaml b/config/jobs/kubernetes/kops/kops-presubmits-scale.yaml
index 6da07863fb7a..ee8b7f253d33 100644
--- a/config/jobs/kubernetes/kops/kops-presubmits-scale.yaml
+++ b/config/jobs/kubernetes/kops/kops-presubmits-scale.yaml
@@ -42,8 +42,6 @@ presubmits:
           value: ubuntu
         - name: GOPATH
           value: /home/prow/go
-        - name: ARTIFACTS
-          value: $(ARTIFACTS)
         - name: CNI_PLUGIN
           value: "amazonvpc"
         - name: KUBE_NODE_COUNT
@@ -60,8 +58,6 @@ presubmits:
           value: "3"
         - name: CONTROL_PLANE_SIZE
           value: "c8a.24xlarge"
-        - name: KOPS_STATE_STORE
-          value: "s3://k8s-infra-kops-scale-tests"
         - name: PROMETHEUS_SCRAPE_KUBE_PROXY
           value: "true"
         - name: CL2_ENABLE_DNS_PROGRAMMING
@@ -90,8 +86,6 @@ presubmits:
           value: "false"
         - name: CLOUD_PROVIDER
           value: "aws"
-        - name: CLUSTER_NAME
-          value: "e2e-ff02749ef8-a423a.tests-kops-aws.k8s.io"
         - name: KOPS_IRSA
           value: "true"
         resources:
@@ -150,8 +144,6 @@ presubmits:
           value: ubuntu
         - name: GOPATH
           value: /home/prow/go
-        - name: ARTIFACTS
-          value: $(ARTIFACTS)
         - name: CNI_PLUGIN
           value: "amazonvpc"
         - name: KUBE_NODE_COUNT
@@ -170,8 +162,6 @@ presubmits:
           value: "false"
         - name: NODE_MODE
           value: "master"
-        - name: KOPS_STATE_STORE
-          value: "s3://k8s-infra-kops-scale-tests"
         - name: PROMETHEUS_SCRAPE_KUBE_PROXY
           value: "true"
         - name: CL2_ENABLE_DNS_PROGRAMMING
@@ -196,8 +186,6 @@ presubmits:
           value: "20s"
         - name: CLOUD_PROVIDER
           value: "aws"
-        - name: CLUSTER_NAME
-          value: "e2e-fa029a0ba8-a2033.tests-kops-aws.k8s.io"
         - name: KOPS_IRSA
           value: "true"
         resources:
@@ -256,8 +244,6 @@ presubmits:
           value: prow
         - name: GOPATH
           value: /home/prow/go
-        - name: ARTIFACTS
-          value: $(ARTIFACTS)
         - name: CNI_PLUGIN
           value: "gce"
         - name: KUBE_NODE_COUNT
@@ -363,8 +349,6 @@ presubmits:
           value: prow
         - name: GOPATH
           value: /home/prow/go
-        - name: ARTIFACTS
-          value: $(ARTIFACTS)
         - name: CNI_PLUGIN
           value: "gce"
         - name: KUBE_NODE_COUNT
@@ -467,8 +451,6 @@ presubmits:
           value: prow
         - name: GOPATH
           value: /home/prow/go
-        - name: ARTIFACTS
-          value: $(ARTIFACTS)
         - name: CNI_PLUGIN
           value: "kindnet"
         - name: KUBE_PROXY_MODE
diff --git a/config/jobs/kubernetes/sig-cloud-provider/aws/ec2-e2e.yaml b/config/jobs/kubernetes/sig-cloud-provider/aws/ec2-e2e.yaml
index d0768ca83a50..8c2f3625657e 100644
--- a/config/jobs/kubernetes/sig-cloud-provider/aws/ec2-e2e.yaml
+++ b/config/jobs/kubernetes/sig-cloud-provider/aws/ec2-e2e.yaml
@@ -924,7 +924,6 @@ periodics:
         - --ttl=6h
         - --path=s3://provider-aws-test-infra/objs.json
         - --region=us-east-1
-        - --sweep-count=2
         image: gcr.io/k8s-staging-boskos/aws-janitor:v20260107-c2c6f43
         resources:
           requests:
diff --git a/config/jobs/kubernetes/sig-scalability/sig-scalability-periodic-ec2.yaml b/config/jobs/kubernetes/sig-scalability/sig-scalability-periodic-ec2.yaml
index 3981924cf861..c8709d7ad756 100644
--- a/config/jobs/kubernetes/sig-scalability/sig-scalability-periodic-ec2.yaml
+++ b/config/jobs/kubernetes/sig-scalability/sig-scalability-periodic-ec2.yaml
@@ -19,7 +19,6 @@ periodics:
       args:
       - --ttl=12h
       - --path=s3://k8s-infra-kops-scale-tests/objs.json
-      - --sweep-count=2
       image: gcr.io/k8s-staging-boskos/aws-janitor:v20260107-c2c6f43
       resources:
         requests:
@@ -88,8 +87,6 @@ periodics:
         value: ubuntu
       - name: GOPATH
         value: /home/prow/go
-      - name: ARTIFACTS
-        value: $(ARTIFACTS)
       - name: CNI_PLUGIN
         value: "amazonvpc"
       - name: KUBE_NODE_COUNT
@@ -106,8 +103,6 @@ periodics:
         value: "3"
       - name: CONTROL_PLANE_SIZE
         value: "c8a.24xlarge"
-      - name: KOPS_STATE_STORE
-        value: "s3://k8s-infra-kops-scale-tests"
       - name: PROMETHEUS_SCRAPE_KUBE_PROXY
         value: "true"
       - name: CL2_ENABLE_DNS_PROGRAMMING
@@ -120,12 +115,12 @@ periodics:
         value: "1"
       - name: ENABLE_PROMETHEUS_SERVER
         value: "true"
+      - name: TEAR_DOWN_PROMETHEUS_SERVER
+        value: "false"
       - name: PROMETHEUS_PVC_STORAGE_CLASS
         value: "io2"
       - name: CLOUD_PROVIDER
         value: "aws"
-      - name: CLUSTER_NAME
-        value: "scale-5000.periodic.test-cncf-aws.k8s.io"
       - name: KOPS_IRSA
         value: "true"
       resources:
@@ -194,8 +189,6 @@ periodics:
         value: ubuntu
       - name: GOPATH
         value: /home/prow/go
-      - name: ARTIFACTS
-        value: $(ARTIFACTS)
       - name: CNI_PLUGIN
         value: "amazonvpc"
       - name: KUBE_NODE_COUNT
@@ -212,8 +205,6 @@ periodics:
         value: "3"
       - name: CONTROL_PLANE_SIZE
         value: "c8a.8xlarge"
-      - name: KOPS_STATE_STORE
-        value: "s3://k8s-infra-kops-scale-tests"
       - name: PROMETHEUS_SCRAPE_KUBE_PROXY
         value: "true"
       - name: CL2_ENABLE_DNS_PROGRAMMING
@@ -226,12 +217,12 @@ periodics:
         value: "1"
       - name: ENABLE_PROMETHEUS_SERVER
         value: "true"
+      - name: TEAR_DOWN_PROMETHEUS_SERVER
+        value: "false"
       - name: PROMETHEUS_PVC_STORAGE_CLASS
         value: "io2"
       - name: CLOUD_PROVIDER
         value: "aws"
-      - name: CLUSTER_NAME
-        value: "scale-100.periodic.test-cncf-aws.k8s.io"
       - name: KOPS_IRSA
         value: "true"
       resources:
diff --git a/config/jobs/kubernetes/sig-scalability/sig-scalability-presubmit-jobs.yaml b/config/jobs/kubernetes/sig-scalability/sig-scalability-presubmit-jobs.yaml
index 5859ffe69f4b..0deff10e2b73 100644
--- a/config/jobs/kubernetes/sig-scalability/sig-scalability-presubmit-jobs.yaml
+++ b/config/jobs/kubernetes/sig-scalability/sig-scalability-presubmit-jobs.yaml
@@ -851,6 +851,7 @@ presubmits:
       preset-aws-credential-boskos-scale-001-kops: "true"
       preset-dind-enabled: "true"
     decorate: true
+    max_concurrency: 3
     decoration_config:
       timeout: 100m
     path_alias: k8s.io/perf-tests
@@ -883,8 +884,6 @@ presubmits:
           value: ubuntu
         - name: GOPATH
           value: /home/prow/go
-        - name: ARTIFACTS
-          value: $(ARTIFACTS)
         - name: CNI_PLUGIN
           value: "amazonvpc"
         - name: KUBE_NODE_COUNT
@@ -901,8 +900,6 @@ presubmits:
           value: "3"
         - name: CONTROL_PLANE_SIZE
           value: "c5.9xlarge"
-        - name: KOPS_STATE_STORE
-          value: "s3://k8s-infra-kops-scale-tests"
         - name: PROMETHEUS_SCRAPE_KUBE_PROXY
           value: "true"
         - name: CL2_ENABLE_DNS_PROGRAMMING
@@ -921,8 +918,6 @@ presubmits:
           value: "gp2"
         - name: CLOUD_PROVIDER
           value: "aws"
-        - name: CLUSTER_NAME
-          value: "pull-perf-scale-100.presubmit.test-cncf-aws.k8s.io"
         - name: KOPS_IRSA
           value: "true"
         resources:
@@ -974,8 +969,6 @@ presubmits:
           value: ubuntu
         - name: GOPATH
           value: /home/prow/go
-        - name: ARTIFACTS
-          value: $(ARTIFACTS)
         - name: CNI_PLUGIN
           value: "amazonvpc"
         - name: KUBE_NODE_COUNT
@@ -991,9 +984,92 @@ presubmits:
         - name: CONTROL_PLANE_COUNT
           value: "3"
         - name: CONTROL_PLANE_SIZE
-          value: "c5.9xlarge"
-        - name: KOPS_STATE_STORE
-          value: "s3://k8s-infra-kops-scale-tests"
+          value: "c8a.12xlarge"
+        - name: PROMETHEUS_SCRAPE_KUBE_PROXY
+          value: "true"
+        - name: CL2_ENABLE_DNS_PROGRAMMING
+          value: "true"
+        - name: CL2_ENABLE_API_AVAILABILITY_MEASUREMENT
+          value: "true"
+        - name: CL2_API_AVAILABILITY_PERCENTAGE_THRESHOLD
+          value: "99.5"
+        - name: CL2_ALLOWED_SLOW_API_CALLS
+          value: "1"
+        - name: ENABLE_PROMETHEUS_SERVER
+          value: "true"
+        - name: TEAR_DOWN_PROMETHEUS_SERVER
+          value: "false"
+        - name: PROMETHEUS_PVC_STORAGE_CLASS
+          value: "gp2"
+        - name: CLOUD_PROVIDER
+          value: "aws"
+        - name: KOPS_IRSA
+          value: "true"
+        resources:
+          requests:
+            cpu: 5
+            memory: 16Gi
+          limits:
+            cpu: 5
+            memory: 16Gi
+
+  - name: pull-perf-tests-ec2-master-scale-performance-5000
+    cluster: eks-prow-build-cluster
+    always_run: false
+    labels:
+      preset-service-account: "true"
+      preset-aws-ssh: "true"
+      preset-aws-credential-boskos-scale-001-kops: "true"
+      preset-dind-enabled: "true"
+    decorate: true
+    decoration_config:
+      timeout: 100m
+    path_alias: k8s.io/perf-tests
+    extra_refs:
+    - org: kubernetes
+      repo: kubernetes
+      base_ref: master
+      path_alias: k8s.io/kubernetes
+    - org: kubernetes
+      repo: kops
+      base_ref: master
+      workdir: true
+      path_alias: k8s.io/kops
+    annotations:
+      testgrid-dashboards: presubmits-kubernetes-scalability
+      testgrid-tab-name: pull-perf-tests-ec2-master-scale-performance-5000
+    spec:
+      containers:
+      - image: us-central1-docker.pkg.dev/k8s-staging-test-infra/images/kubekins-e2e:v20260120-e2c483ffe9-master
+        command:
+        - runner.sh
+        args:
+        - ./tests/e2e/scenarios/scalability/run-test.sh
+        securityContext:
+          privileged: true
+        env:
+        - name: KUBE_SSH_KEY_PATH
+          value: /etc/aws-ssh/aws-ssh-private
+        - name: KUBE_SSH_USER
+          value: ubuntu
+        - name: GOPATH
+          value: /home/prow/go
+        - name: CNI_PLUGIN
+          value: "amazonvpc"
+        - name: KUBE_NODE_COUNT
+          value: "5000"
+        - name: CL2_LOAD_TEST_THROUGHPUT
+          value: "50"
+        - name: CL2_DELETE_TEST_THROUGHPUT
+          value: "50"
+        - name: CL2_RATE_LIMIT_POD_CREATION
+          value: "false"
+        - name: NODE_MODE
+          value: "master"
+        - name: CONTROL_PLANE_COUNT
+          value: "3"
+        - name: CONTROL_PLANE_SIZE
+          value: "c8a.24xlarge"
         - name: PROMETHEUS_SCRAPE_KUBE_PROXY
           value: "true"
         - name: CL2_ENABLE_DNS_PROGRAMMING
@@ -1012,8 +1088,6 @@ presubmits:
           value: "gp2"
         - name: CLOUD_PROVIDER
           value: "aws"
-        - name: CLUSTER_NAME
-          value: "pull-perf-scale-500.presubmit.test-cncf-aws.k8s.io"
         - name: KOPS_IRSA
           value: "true"
         resources:
@@ -1031,6 +1105,7 @@ presubmits:
       preset-k8s-ssh: "true"
       preset-dind-enabled: "true"
     decorate: true
+    max_concurrency: 3
     decoration_config:
       timeout: 100m
     path_alias: k8s.io/perf-tests
@@ -1064,8 +1139,6 @@ presubmits:
           value: prow
         - name: GOPATH
           value: /home/prow/go
-        - name: ARTIFACTS
-          value: $(ARTIFACTS)
         - name: CNI_PLUGIN
           value: gce
         - name: KUBE_NODE_COUNT