diff --git a/Jenkinsfile b/Jenkinsfile
index 0a178244..6271fb16 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -35,7 +35,7 @@ spec:
   topologySpreadConstraints:
     - maxSkew: 1
       topologyKey: kubernetes.io/hostname
-      whenUnsatisfiable: ScheduleAnyway
+      whenUnsatisfiable: DoNotSchedule
       labelSelector:
         matchLabels:
           jenkins/jenkins-jenkins-agent: "true"
diff --git a/ci/Jenkinsfile.titan-iac b/ci/Jenkinsfile.titan-iac
index d733f0ff..56120795 100644
--- a/ci/Jenkinsfile.titan-iac
+++ b/ci/Jenkinsfile.titan-iac
@@ -34,7 +34,7 @@ spec:
   topologySpreadConstraints:
     - maxSkew: 1
       topologyKey: kubernetes.io/hostname
-      whenUnsatisfiable: ScheduleAnyway
+      whenUnsatisfiable: DoNotSchedule
       labelSelector:
         matchLabels:
           jenkins/jenkins-jenkins-agent: "true"
diff --git a/services/jenkins/configmap-jcasc.yaml b/services/jenkins/configmap-jcasc.yaml
index 72d084e2..aae846eb 100644
--- a/services/jenkins/configmap-jcasc.yaml
+++ b/services/jenkins/configmap-jcasc.yaml
@@ -475,7 +475,7 @@ data:
       clouds:
       - kubernetes:
           capOnlyOnAlivePods: true
-          containerCapStr: "8"
+          containerCapStr: "5"
           connectTimeout: "20"
           readTimeout: "90"
           jenkinsUrl: "http://jenkins.jenkins.svc.cluster.local:8080"
@@ -569,7 +569,7 @@ data:
                   topologySpreadConstraints:
                     - maxSkew: 1
                       topologyKey: kubernetes.io/hostname
-                      whenUnsatisfiable: ScheduleAnyway
+                      whenUnsatisfiable: DoNotSchedule
                       labelSelector:
                         matchLabels:
                           jenkins/jenkins-jenkins-agent: "true"
diff --git a/services/logging/Jenkinsfile.data-prepper b/services/logging/Jenkinsfile.data-prepper
index 116a80bb..1de8b249 100644
--- a/services/logging/Jenkinsfile.data-prepper
+++ b/services/logging/Jenkinsfile.data-prepper
@@ -52,7 +52,7 @@ spec:
   topologySpreadConstraints:
     - maxSkew: 1
       topologyKey: kubernetes.io/hostname
-      whenUnsatisfiable: ScheduleAnyway
+      whenUnsatisfiable: DoNotSchedule
       labelSelector:
         matchLabels:
           jenkins/jenkins-jenkins-agent: "true"
diff --git a/services/maintenance/node-image-sweeper-daemonset.yaml b/services/maintenance/node-image-sweeper-daemonset.yaml
index 5b03cdc4..9dc65f5b 100644
--- a/services/maintenance/node-image-sweeper-daemonset.yaml
+++ b/services/maintenance/node-image-sweeper-daemonset.yaml
@@ -47,6 +47,13 @@ spec:
           securityContext:
             privileged: true
             runAsUser: 0
+          resources:
+            requests:
+              cpu: 10m
+              memory: 32Mi
+            limits:
+              cpu: 100m
+              memory: 256Mi
           volumeMounts:
             - name: host-root
               mountPath: /host