diff --git a/nextcloud/manifests/app.yml b/nextcloud/manifests/app.yml
index 3720621835419d8e02dddcfdbd490dbd25994232..7e56e072d94e63f20aa4a9393719cc7d6bb9008b 100644
--- a/nextcloud/manifests/app.yml
+++ b/nextcloud/manifests/app.yml
@@ -1,3 +1,4 @@
+---
 apiVersion: v1
 kind: Service
 metadata:
@@ -117,20 +118,18 @@ spec:
                 values:
                 - "true"
         podAntiAffinity:
-          preferredDuringSchedulingIgnoredDuringExecution:
-          - weight: 100
-            podAffinityTerm:
-              topologyKey: kubernetes.io/hostname
-              labelSelector:
-                matchExpressions:
-                - key: app.kubernetes.io/instance
-                  operator: In
-                  values:
-                  - ${FQDN} 
-                - key: app.kubernetes.io/component
-                  operator: In
-                  values:
-                  - app
+          requiredDuringSchedulingIgnoredDuringExecution:
+          - topologyKey: kubernetes.io/hostname
+            labelSelector:
+              matchExpressions:
+              - key: app.kubernetes.io/instance
+                operator: In
+                values:
+                - ${FQDN}
+              - key: app.kubernetes.io/component
+                operator: In
+                values:
+                - app
       containers:
       - command:
         - php-fpm
@@ -192,7 +191,11 @@ spec:
         - containerPort: 9000
           name: api
           protocol: TCP
-        resources: {}
+        resources: 
+          requests:
+            memory: "80Mi"
+          limits:
+            memory: "500Mi"
         terminationMessagePath: /dev/termination-log
         terminationMessagePolicy: File
       dnsPolicy: ClusterFirst
@@ -238,21 +241,34 @@ spec:
         app.kubernetes.io/part-of: Nextcloud
     spec:
       affinity:
-        podAntiAffinity:
+        podAffinity:
           preferredDuringSchedulingIgnoredDuringExecution:
-          - weight: 100
-            podAffinityTerm:
-              topologyKey: kubernetes.io/hostname
-              labelSelector:
-                matchExpressions:
-                - key: app.kubernetes.io/instance
-                  operator: In
-                  values:
-                  - ${FQDN} 
-                - key: app.kubernetes.io/component
-                  operator: In
-                  values:
-                  - web 
+            - weight: 10
+              podAffinityTerm:
+                topologyKey: kubernetes.io/hostname
+                labelSelector:
+                  matchExpressions:
+                  - key: app.kubernetes.io/instance
+                    operator: In
+                    values:
+                    - ${FQDN}
+                  - key: app.kubernetes.io/component
+                    operator: In
+                    values:
+                    - app
+        podAntiAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+          - topologyKey: kubernetes.io/hostname
+            labelSelector:
+              matchExpressions:
+              - key: app.kubernetes.io/instance
+                operator: In
+                values:
+                - ${FQDN} 
+              - key: app.kubernetes.io/component
+                operator: In
+                values:
+                - web
       containers:
       - image: libresh/nextcloud:${NC_WEB_IMAGE_TAG}
         imagePullPolicy: Always
diff --git a/rocketchat/manifests/app.yml b/rocketchat/manifests/app.yml
index 5f4bbaac2c5a69e9f612d72d6f665645b24403c3..4420b30f1d48507c4ef2b4e839b6e9e79f92a82c 100644
--- a/rocketchat/manifests/app.yml
+++ b/rocketchat/manifests/app.yml
@@ -1,3 +1,4 @@
+---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -42,16 +43,14 @@ spec:
                 values:
                 - "true"
         podAntiAffinity:
-          preferredDuringSchedulingIgnoredDuringExecution:
-          - weight: 100
-            podAffinityTerm:
-              topologyKey: kubernetes.io/hostname
-              labelSelector:
-                matchExpressions:
-                - key: app.kubernetes.io/instance
-                  operator: In
-                  values:
-                  - ${FQDN} 
+          requiredDuringSchedulingIgnoredDuringExecution:
+          - topologyKey: kubernetes.io/hostname
+            labelSelector:
+              matchExpressions:
+              - key: app.kubernetes.io/instance
+                operator: In
+                values:
+                - ${FQDN}
       containers:
       - env:
         - name: TZ
@@ -141,7 +140,11 @@ spec:
         - containerPort: 3000
           name: http
           protocol: TCP
-        resources: {}
+        resources:
+          requests:
+            memory: "500Mi"
+          limits:
+            memory: "2Gi"
         terminationMessagePath: /dev/termination-log
         terminationMessagePolicy: File
       dnsPolicy: ClusterFirst