diff --git a/cluster/manifests/freeleaps-devops-system/argo-cd/values.yaml b/cluster/manifests/freeleaps-devops-system/argo-cd/values.yaml
index 6e396b38..f7f8ef7f 100644
--- a/cluster/manifests/freeleaps-devops-system/argo-cd/values.yaml
+++ b/cluster/manifests/freeleaps-devops-system/argo-cd/values.yaml
@@ -1223,11 +1223,23 @@ repoServer:
 
   # -- [Tolerations] for use with node taints
   # @default -- `[]` (defaults to global.tolerations)
-  tolerations: []
+  tolerations:
+    - effect: NoSchedule
+      key: node-role.kubernetes.io/devops
+      value: "true"
+      operator: Equal
 
   # -- Assign custom [affinity] rules to the deployment
   # @default -- `{}` (defaults to global.affinity preset)
-  affinity: {}
+  affinity:
+    nodeAffinity:                                                                                                                                                                          
+      requiredDuringSchedulingIgnoredDuringExecution:                                                                                                                                      
+        nodeSelectorTerms:                                                                                                                                                                 
+        - matchExpressions:                                                                                                                                                                
+          - key: node-role.kubernetes.io/devops                                                                                                                                            
+            operator: In                                                                                                                                                                   
+            values:                                                                                                                                                                        
+            - "true" 
 
   # -- Assign custom [TopologySpreadConstraints] rules to the repo server
   # @default -- `[]` (defaults to global.topologySpreadConstraints)
@@ -1596,11 +1608,23 @@ applicationSet:
 
   # -- [Tolerations] for use with node taints
   # @default -- `[]` (defaults to global.tolerations)
-  tolerations: []
+  tolerations:
+    - effect: NoSchedule
+      key: node-role.kubernetes.io/devops
+      value: "true"
+      operator: Equal
 
   # -- Assign custom [affinity] rules
   # @default -- `{}` (defaults to global.affinity preset)
-  affinity: {}
+  affinity:
+    nodeAffinity:                                                                                                                                                                          
+      requiredDuringSchedulingIgnoredDuringExecution:                                                                                                                                      
+        nodeSelectorTerms:                                                                                                                                                                 
+        - matchExpressions:                                                                                                                                                                
+          - key: node-role.kubernetes.io/devops                                                                                                                                            
+            operator: In                                                                                                                                                                   
+            values:                                                                                                                                                                        
+            - "true" 
 
   # -- Assign custom [TopologySpreadConstraints] rules to the ApplicationSet controller
   # @default -- `[]` (defaults to global.topologySpreadConstraints)
@@ -1976,11 +2000,23 @@ notifications:
 
   # -- [Tolerations] for use with node taints
   # @default -- `[]` (defaults to global.tolerations)
-  tolerations: []
+  tolerations:
+    - effect: NoSchedule
+      key: node-role.kubernetes.io/devops
+      value: "true"
+      operator: Equal
 
   # -- Assign custom [affinity] rules
   # @default -- `{}` (defaults to global.affinity preset)
-  affinity: {}
+  affinity:
+    nodeAffinity:                                                                                                                                                                          
+      requiredDuringSchedulingIgnoredDuringExecution:                                                                                                                                      
+        nodeSelectorTerms:                                                                                                                                                                 
+        - matchExpressions:                                                                                                                                                                
+          - key: node-role.kubernetes.io/devops                                                                                                                                            
+            operator: In                                                                                                                                                                   
+            values:                                                                                                                                                                        
+            - "true" 
 
   # -- Assign custom [TopologySpreadConstraints] rules to the application controller
   # @default -- `[]` (defaults to global.topologySpreadConstraints)
diff --git a/cluster/manifests/freeleaps-devops-system/jenkins/values.yaml b/cluster/manifests/freeleaps-devops-system/jenkins/values.yaml
index 26c184d9..5d1b1547 100644
--- a/cluster/manifests/freeleaps-devops-system/jenkins/values.yaml
+++ b/cluster/manifests/freeleaps-devops-system/jenkins/values.yaml
@@ -660,7 +660,11 @@ controller:
 
   # ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#taints-and-tolerations-beta-feature
   # -- Toleration labels for pod assignment
-  tolerations: []
+  tolerations:
+    - effect: NoSchedule
+      key: node-role.kubernetes.io/devops
+      value: "true"
+      operator: Equal
   # -- Set TerminationGracePeriodSeconds
   terminationGracePeriodSeconds:
   # -- Set the termination message path
@@ -669,7 +673,15 @@ controller:
   terminationMessagePolicy:
 
   # -- Affinity settings
-  affinity: {}
+  affinity:
+    nodeAffinity:                                                                                                                                                                          
+      requiredDuringSchedulingIgnoredDuringExecution:                                                                                                                                      
+        nodeSelectorTerms:                                                                                                                                                                 
+        - matchExpressions:                                                                                                                                                                
+          - key: node-role.kubernetes.io/devops                                                                                                                                            
+            operator: In                                                                                                                                                                   
+            values:                                                                                                                                                                        
+            - "true" 
 
   # Leverage a priorityClass to ensure your pods survive resource shortages
   # ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/
diff --git a/freeleaps/helm-pkg/3rd/rabbitmq/values.alpha.yaml b/freeleaps/helm-pkg/3rd/rabbitmq/values.alpha.yaml
index 8dabfcfb..49ca8452 100644
--- a/freeleaps/helm-pkg/3rd/rabbitmq/values.alpha.yaml
+++ b/freeleaps/helm-pkg/3rd/rabbitmq/values.alpha.yaml
@@ -12,6 +12,13 @@ image:
 namespaceOverride: "freeleaps-alpha"
 clusterDomain: freeleaps.cluster
 automountServiceAccountToken: true
+resources:
+  requests:
+    cpu: 100m
+    memory: 256Mi
+  limits:
+    cpu: 300m
+    memory: 512Mi
 auth:
   username: user
   password: ""