diff --git a/charts/apps/templates/storage/nfs.yaml b/charts/apps/templates/storage/nfs.yaml
index 288d0e66c6f0d5182a3afb1128616130a8e547cc..0918f36e52f90025cad61c8155f2f65a9719eab4 100644
--- a/charts/apps/templates/storage/nfs.yaml
+++ b/charts/apps/templates/storage/nfs.yaml
@@ -31,6 +31,10 @@ spec:
       version: v3
       releaseName: nfs-condo
       values: |
+        image:
+          repository: kooper/nfs-subdir-external-provisioner
+          tag: v4.0.3
+
         storageClass:
           name: nfs-condo
           archiveOnDelete: false
diff --git a/terraform/modules/argocd/templates/argocd.yaml.tmpl b/terraform/modules/argocd/templates/argocd.yaml.tmpl
index d1461f2431c7575fba6260a5aa170ba5ff20f34b..a241a831c81d5f1e3f7b4aee9799f8bd8edb2531 100644
--- a/terraform/modules/argocd/templates/argocd.yaml.tmpl
+++ b/terraform/modules/argocd/templates/argocd.yaml.tmpl
@@ -89,7 +89,7 @@ spec:
           enabled: ${nfs_enabled}
           server: ${nfs_server}
           path: ${nfs_path}
-          pathPattern: "${cluster_name}/$${.PVC.namespace}-$${.PVC.name}-$${.PV.name}"
+          pathPattern: "${cluster_name}/$${.PVC.namespace}-$${.PVC.name}-$${.PVC.volume}"
 
         cinder:
           enabled: ${cinder_enabled}