diff --git a/apps/guacamole/guacamole.yaml b/apps/guacamole/guacamole.yaml
index ca5c067..ed8b278 100644
--- a/apps/guacamole/guacamole.yaml
+++ b/apps/guacamole/guacamole.yaml
@@ -19,9 +19,15 @@ metadata:
   namespace: guacamole
   labels:
     app: guac-mysql
+    argocd.argoproj.io/instance: infra-guacamole
 spec:
+  persistentVolumeClaimRetentionPolicy:
+    whenDeleted: Retain
+    whenScaled: Retain
+  podManagementPolicy: OrderedReady
   serviceName: guac-mysql
   replicas: 1
+  revisionHistoryLimit: 10
   selector:
     matchLabels:
       app: guac-mysql
@@ -94,6 +100,10 @@ spec:
         resources:
           requests:
             storage: 5Gi
+  updateStrategy:
+    rollingUpdate:
+      partition: 0
+    type: RollingUpdate
 ---
 apiVersion: v1
 kind: Service
diff --git a/apps/matrix/matrix.yaml b/apps/matrix/matrix.yaml
index 6669a35..4865803 100644
--- a/apps/matrix/matrix.yaml
+++ b/apps/matrix/matrix.yaml
@@ -76,15 +76,21 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: matrix-postgres
-  namespace: matrix
-  labels:
-    app: matrix-postgres
-spec:
-  serviceName: matrix-postgres
-  replicas: 1
-  selector:
-    matchLabels:
-      app: matrix-postgres
+  namespace: matrix
+  labels:
+    app: matrix-postgres
+    argocd.argoproj.io/instance: infra-matrix
+spec:
+  persistentVolumeClaimRetentionPolicy:
+    whenDeleted: Retain
+    whenScaled: Retain
+  podManagementPolicy: OrderedReady
+  serviceName: matrix-postgres
+  replicas: 1
+  revisionHistoryLimit: 10
+  selector:
+    matchLabels:
+      app: matrix-postgres
   template:
     metadata:
       labels:
@@ -138,12 +144,16 @@ spec:
       spec:
         accessModes: [ReadWriteOnce]
         volumeMode: Filesystem
-        resources:
-          requests:
-            storage: 5Gi
----
-apiVersion: v1
-kind: Service
+        resources:
+          requests:
+            storage: 5Gi
+  updateStrategy:
+    rollingUpdate:
+      partition: 0
+    type: RollingUpdate
+---
+apiVersion: v1
+kind: Service
 metadata:
   name: matrix-postgres
   namespace: matrix