diff --git a/infrastructures/postgresql/env/k3s-cluster/values.yaml b/infrastructures/postgresql/env/k3s-cluster/values.yaml
index 5f2148d..68325db 100644
--- a/infrastructures/postgresql/env/k3s-cluster/values.yaml
+++ b/infrastructures/postgresql/env/k3s-cluster/values.yaml
@@ -26,6 +26,8 @@ primary:
     selector:
       matchLabels:
         name: postgresql-primary-pvc
+  persistentVolumeClaimRetentionPolicy:
+    enabled: true
 readReplicas:
   name: "replica"
   podSecurityContext:
@@ -43,4 +45,6 @@ readReplicas:
     existingClaim: postgresql-replica-pvc
     selector:
       matchLabels:
-        name: postgresql-replica-pvc
\ No newline at end of file
+        name: postgresql-replica-pvc
+  persistentVolumeClaimRetentionPolicy:
+    enabled: true
\ No newline at end of file
diff --git a/resources/app-volumes/env/k3s-cluster/templates/postgresql-primary-pv.yaml b/resources/app-volumes/env/k3s-cluster/templates/postgresql-primary-pv.yaml
index 03dd795..49daad8 100644
--- a/resources/app-volumes/env/k3s-cluster/templates/postgresql-primary-pv.yaml
+++ b/resources/app-volumes/env/k3s-cluster/templates/postgresql-primary-pv.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: PersistentVolume
 metadata:
   name: postgresql-primary-pv
-  namespace: postgresql
+  namespace: argocd
   labels:
     type: local
 spec:
diff --git a/resources/app-volumes/env/k3s-cluster/templates/postgresql-primary-pvc.yaml b/resources/app-volumes/env/k3s-cluster/templates/postgresql-primary-pvc.yaml
index d95e66d..1ee26f6 100644
--- a/resources/app-volumes/env/k3s-cluster/templates/postgresql-primary-pvc.yaml
+++ b/resources/app-volumes/env/k3s-cluster/templates/postgresql-primary-pvc.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: postgresql-primary-pvc
-  namespace: postgresql
+  namespace: argocd
   labels:
     name: postgresql-primary-pvc
 spec:
diff --git a/resources/app-volumes/env/k3s-cluster/templates/postgresql-replica-pv.yaml b/resources/app-volumes/env/k3s-cluster/templates/postgresql-replica-pv.yaml
index b59866e..f8c5aea 100644
--- a/resources/app-volumes/env/k3s-cluster/templates/postgresql-replica-pv.yaml
+++ b/resources/app-volumes/env/k3s-cluster/templates/postgresql-replica-pv.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: PersistentVolume
 metadata:
   name: postgresql-replica-pv
-  namespace: flux-system
+  namespace: argocd
   labels:
     type: local
 spec:
diff --git a/resources/app-volumes/env/k3s-cluster/templates/postgresql-replica-pvc.yaml b/resources/app-volumes/env/k3s-cluster/templates/postgresql-replica-pvc.yaml
index 5953fb6..c9f60cd 100644
--- a/resources/app-volumes/env/k3s-cluster/templates/postgresql-replica-pvc.yaml
+++ b/resources/app-volumes/env/k3s-cluster/templates/postgresql-replica-pvc.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: postgresql-replica-pvc
-  namespace: postgresql
+  namespace: argocd
   labels:
     name: postgresql-replica-pvc
 spec: