diff --git a/components/pipeline-service/development/main-pipeline-service-configuration.yaml b/components/pipeline-service/development/main-pipeline-service-configuration.yaml
index 75829e32ca8..0349a5d2e65 100644
--- a/components/pipeline-service/development/main-pipeline-service-configuration.yaml
+++ b/components/pipeline-service/development/main-pipeline-service-configuration.yaml
@@ -1875,7 +1875,7 @@ spec:
                 key: endpoint
         tolerations:
           - effect: NoSchedule
-            key: node-role.kubernetes.io/master
+            key: konflux-ci.dev/workload
             operator: Exists
         securityContext:
           allowPrivilegeEscalation: false
diff --git a/components/pipeline-service/staging/base/main-pipeline-service-configuration.yaml b/components/pipeline-service/staging/base/main-pipeline-service-configuration.yaml
index 0356c0073ed..b4059b09f16 100644
--- a/components/pipeline-service/staging/base/main-pipeline-service-configuration.yaml
+++ b/components/pipeline-service/staging/base/main-pipeline-service-configuration.yaml
@@ -1827,8 +1827,9 @@ spec:
                 key: endpoint
         tolerations:
           - effect: NoSchedule
-            key: node-role.kubernetes.io/master
-            operator: Exists
+            key: konflux-ci.dev/workload
+            operator: Equal
+            value: konflux-tenants
         securityContext:
           allowPrivilegeEscalation: false
           capabilities:
diff --git a/components/pipeline-service/staging/stone-stage-p01/deploy.yaml b/components/pipeline-service/staging/stone-stage-p01/deploy.yaml
index cdd39ba0933..f54e2472df6 100644
--- a/components/pipeline-service/staging/stone-stage-p01/deploy.yaml
+++ b/components/pipeline-service/staging/stone-stage-p01/deploy.yaml
@@ -1816,8 +1816,9 @@ spec:
                 key: endpoint
         tolerations:
           - effect: NoSchedule
-            key: node-role.kubernetes.io/master
-            operator: Exists
+            key: konflux-ci.dev/workload
+            operator: Equal
+            value: konflux-tenants
         securityContext:
           allowPrivilegeEscalation: false
           capabilities:
diff --git a/components/pipeline-service/staging/stone-stg-rh01/deploy.yaml b/components/pipeline-service/staging/stone-stg-rh01/deploy.yaml
index 98fb0e01d7b..6dbbd6c4e8f 100644
--- a/components/pipeline-service/staging/stone-stg-rh01/deploy.yaml
+++ b/components/pipeline-service/staging/stone-stg-rh01/deploy.yaml
@@ -1816,8 +1816,9 @@ spec:
                 key: endpoint
         tolerations:
           - effect: NoSchedule
-            key: node-role.kubernetes.io/master
-            operator: Exists
+            key: konflux-ci.dev/workload
+            operator: Equal
+            value: konflux-tenants
         securityContext:
           allowPrivilegeEscalation: false
           capabilities: