diff --git a/examples/efs-persistent-volumes/settings.efs-access-points.tf b/examples/efs-persistent-volumes/settings.efs-access-points.tf
index 8065f6d..b9741f1 100644
--- a/examples/efs-persistent-volumes/settings.efs-access-points.tf
+++ b/examples/efs-persistent-volumes/settings.efs-access-points.tf
@@ -1,17 +1,9 @@
 locals {
-  efs_ap_namespaces = ["geo", "gpp", "ams", "aps", "sdpcs"]
-  efs_ap_pv         = ["logs", "apps"]
-  efs_ap            = [for p in setproduct(local.efs_ap_namespaces, local.efs_ap_pv) : { label = format("%v-%v", p[0], p[1]), namespace = p[0], volume = p[1] }]
-  efs_access_points = length(var.efs_access_points) > 0 ? var.efs_access_points : [for p in local.efs_ap : {
-    label           = p.label
-    name            = format("%v-data-%v", p.namespace, p.volume)
-    path            = format("/data-%v", p.label)
-    owner_uid       = 51000
-    owner_gid       = 51000
-    permissions     = "755"
-    claim_name      = format("data-%v", p.volume)
-    claim_namespace = p.namespace
-  }]
+  #  efs_ap_namespaces = ["geo", "gpp", "ams", "aps", "sdpcs"]
+  #  efs_ap_pv         = ["logs", "apps"]
+  #  efs_ap            = [for p in setproduct(local.efs_ap_namespaces, local.efs_ap_pv) : { label = format("%v-%v", p[0], p[1]), namespace = p[0], volume = p[1] }]
+  #  efs_access_points = length(var.efs_access_points) > 0 ? var.efs_access_points : [for p in local.efs_ap : {
+  efs_access_points = [for p in var.efs_access_points : merge(p, { label = format("%v-%v", p.claim_namespace, p.name) })]
 }
 
 # Namespace	Persistent Volume (PV)	Persistent Volume Claim (PVC)
diff --git a/examples/efs-persistent-volumes/variables.efs-access-points.auto.tfvars b/examples/efs-persistent-volumes/variables.efs-access-points.auto.tfvars
index 9b6e56b..70e2d32 100644
--- a/examples/efs-persistent-volumes/variables.efs-access-points.auto.tfvars
+++ b/examples/efs-persistent-volumes/variables.efs-access-points.auto.tfvars
@@ -1,20 +1,20 @@
 efs_access_points = [
   {
-    name            = "data1-logs"
-    path            = "/data1logs"
+    name            = "data-logs"
+    path            = "/data_logs"
     owner_uid       = 51000
     owner_gid       = 51000
     permissions     = "755"
-    claim_name      = null
-    claim_namespace = "gups"
+    claim_name      = "logs"
+    claim_namespace = "geo"
   },
   {
-    name            = "data1-geoserver"
-    path            = "/data1geoserver"
+    name            = "data-apps"
+    path            = "/data_apps"
     owner_uid       = 51000
     owner_gid       = 51000
     permissions     = "755"
-    claim_name      = null
-    claim_namespace = "gups"
+    claim_name      = "apps"
+    claim_namespace = "geo"
   },
 ]