diff --git a/config/clusters/2i2c-aws-us/basehub-common.values.yaml b/config/clusters/2i2c-aws-us/basehub-common.values.yaml
index 0b8dde05db..acdc2fa1ff 100644
--- a/config/clusters/2i2c-aws-us/basehub-common.values.yaml
+++ b/config/clusters/2i2c-aws-us/basehub-common.values.yaml
@@ -1,5 +1,7 @@
 nfs:
+  enabled: true
   pv:
+    enabled: true
     # from https://docs.aws.amazon.com/efs/latest/ug/mounting-fs-nfs-mount-settings.html
     mountOptions:
       - rsize=1048576
diff --git a/config/clusters/2i2c-aws-us/cosmicds.values.yaml b/config/clusters/2i2c-aws-us/cosmicds.values.yaml
index 256f231b5d..b85d2bd7ff 100644
--- a/config/clusters/2i2c-aws-us/cosmicds.values.yaml
+++ b/config/clusters/2i2c-aws-us/cosmicds.values.yaml
@@ -1,5 +1,6 @@
 nfs:
-  # No persistent storage for cosmicds
+  # nfs functionality explicitly disabled in case a common.values.yaml
+  # file is used to enable it for all hubs in the cluster
   enabled: false
   pv:
     enabled: false
diff --git a/config/clusters/2i2c-aws-us/daskhub-common.values.yaml b/config/clusters/2i2c-aws-us/daskhub-common.values.yaml
index 9f3b85edb4..235875165e 100644
--- a/config/clusters/2i2c-aws-us/daskhub-common.values.yaml
+++ b/config/clusters/2i2c-aws-us/daskhub-common.values.yaml
@@ -1,6 +1,8 @@
 basehub:
   nfs:
+    enabled: true
     pv:
+      enabled: true
       # from https://docs.aws.amazon.com/efs/latest/ug/mounting-fs-nfs-mount-settings.html
       mountOptions:
         - rsize=1048576
diff --git a/config/clusters/2i2c-uk/lis.values.yaml b/config/clusters/2i2c-uk/lis.values.yaml
index 1afcfd7eb8..c5c388873f 100644
--- a/config/clusters/2i2c-uk/lis.values.yaml
+++ b/config/clusters/2i2c-uk/lis.values.yaml
@@ -1,6 +1,7 @@
 nfs:
   enabled: true
   pv:
+    enabled: true
     mountOptions:
       - soft
       - noatime
diff --git a/config/clusters/2i2c-uk/staging.values.yaml b/config/clusters/2i2c-uk/staging.values.yaml
index 0ec5159734..72e4e427d9 100644
--- a/config/clusters/2i2c-uk/staging.values.yaml
+++ b/config/clusters/2i2c-uk/staging.values.yaml
@@ -1,6 +1,7 @@
 nfs:
   enabled: true
   pv:
+    enabled: true
     mountOptions:
       - soft
       - noatime
diff --git a/config/clusters/2i2c/basehub-common.values.yaml b/config/clusters/2i2c/basehub-common.values.yaml
index f6def81488..58fe4b616b 100644
--- a/config/clusters/2i2c/basehub-common.values.yaml
+++ b/config/clusters/2i2c/basehub-common.values.yaml
@@ -1,6 +1,7 @@
 nfs:
   enabled: true
   pv:
+    enabled: true
     mountOptions:
       - soft
       - noatime
diff --git a/config/clusters/2i2c/daskhub-common.values.yaml b/config/clusters/2i2c/daskhub-common.values.yaml
index f4c07b56b4..0841fd8668 100644
--- a/config/clusters/2i2c/daskhub-common.values.yaml
+++ b/config/clusters/2i2c/daskhub-common.values.yaml
@@ -2,6 +2,7 @@ basehub:
   nfs:
     enabled: true
     pv:
+      enabled: true
       mountOptions:
         - soft
         - noatime
diff --git a/config/clusters/awi-ciroh/common.values.yaml b/config/clusters/awi-ciroh/common.values.yaml
index 8f0f4f1ec3..793f2e5451 100644
--- a/config/clusters/awi-ciroh/common.values.yaml
+++ b/config/clusters/awi-ciroh/common.values.yaml
@@ -2,6 +2,7 @@ basehub:
   nfs:
     enabled: true
     pv:
+      enabled: true
       mountOptions:
         - soft
         - noatime
diff --git a/config/clusters/catalystproject-africa/common.values.yaml b/config/clusters/catalystproject-africa/common.values.yaml
index d59776bd4a..db89cd7a9c 100644
--- a/config/clusters/catalystproject-africa/common.values.yaml
+++ b/config/clusters/catalystproject-africa/common.values.yaml
@@ -1,5 +1,7 @@
 nfs:
+  enabled: true
   pv:
+    enabled: true
     # from https://docs.aws.amazon.com/efs/latest/ug/mounting-fs-nfs-mount-settings.html
     mountOptions:
       - rsize=1048576
diff --git a/config/clusters/catalystproject-latam/common.values.yaml b/config/clusters/catalystproject-latam/common.values.yaml
index a6f86b9b7b..7c5ecd5b38 100644
--- a/config/clusters/catalystproject-latam/common.values.yaml
+++ b/config/clusters/catalystproject-latam/common.values.yaml
@@ -1,6 +1,7 @@
 nfs:
   enabled: true
   pv:
+    enabled: true
     mountOptions:
       - soft
       - noatime
diff --git a/config/clusters/cloudbank/common.values.yaml b/config/clusters/cloudbank/common.values.yaml
index 6c7e7e8248..ad9d644c60 100644
--- a/config/clusters/cloudbank/common.values.yaml
+++ b/config/clusters/cloudbank/common.values.yaml
@@ -1,5 +1,7 @@
 nfs:
+  enabled: true
   pv:
+    enabled: true
     mountOptions:
       - soft
       - noatime
diff --git a/config/clusters/earthscope/common.values.yaml b/config/clusters/earthscope/common.values.yaml
index 1772c84346..dc64548693 100644
--- a/config/clusters/earthscope/common.values.yaml
+++ b/config/clusters/earthscope/common.values.yaml
@@ -1,6 +1,8 @@
 basehub:
   nfs:
+    enabled: true
     pv:
+      enabled: true
       # from https://docs.aws.amazon.com/efs/latest/ug/mounting-fs-nfs-mount-settings.html
       mountOptions:
         - rsize=1048576
diff --git a/config/clusters/gridsst/common.values.yaml b/config/clusters/gridsst/common.values.yaml
index 5b2c3eeeff..c5a2d3ac95 100644
--- a/config/clusters/gridsst/common.values.yaml
+++ b/config/clusters/gridsst/common.values.yaml
@@ -1,9 +1,11 @@
 basehub:
   nfs:
+    enabled: true
     # FIXME: Enable after https://github.com/yuvipanda/prometheus-dirsize-exporter/pull/7 is used
     dirsizeReporter:
       enabled: false
     pv:
+      enabled: true
       # from https://docs.aws.amazon.com/efs/latest/ug/mounting-fs-nfs-mount-settings.html
       mountOptions:
         - rsize=1048576
diff --git a/config/clusters/hhmi/common.values.yaml b/config/clusters/hhmi/common.values.yaml
index 30114280fe..fc1470fba7 100644
--- a/config/clusters/hhmi/common.values.yaml
+++ b/config/clusters/hhmi/common.values.yaml
@@ -1,9 +1,8 @@
 basehub:
   nfs:
     enabled: true
-    dirsizeReporter:
-      enabled: true
     pv:
+      enabled: true
       mountOptions:
         - soft
         - noatime
diff --git a/config/clusters/hhmi/spyglass.values.yaml b/config/clusters/hhmi/spyglass.values.yaml
index ffc14cec04..f26ad87b1d 100644
--- a/config/clusters/hhmi/spyglass.values.yaml
+++ b/config/clusters/hhmi/spyglass.values.yaml
@@ -1,3 +1,5 @@
+# nfs functionality enabled for this ephemeral hub to mount
+# a shared folder from another hub in the cluster
 nfs:
   enabled: true
   dirsizeReporter:
diff --git a/config/clusters/jupyter-meets-the-earth/common.values.yaml b/config/clusters/jupyter-meets-the-earth/common.values.yaml
index c5c53073f7..6f25206716 100644
--- a/config/clusters/jupyter-meets-the-earth/common.values.yaml
+++ b/config/clusters/jupyter-meets-the-earth/common.values.yaml
@@ -1,6 +1,8 @@
 basehub:
   nfs:
+    enabled: true
     pv:
+      enabled: true
       # from https://docs.aws.amazon.com/efs/latest/ug/mounting-fs-nfs-mount-settings.html
       mountOptions:
         - rsize=1048576
diff --git a/config/clusters/leap/common.values.yaml b/config/clusters/leap/common.values.yaml
index f2ffeeee04..f46cc462b6 100644
--- a/config/clusters/leap/common.values.yaml
+++ b/config/clusters/leap/common.values.yaml
@@ -2,6 +2,7 @@ basehub:
   nfs:
     enabled: true
     pv:
+      enabled: true
       mountOptions:
         - soft
         - noatime
diff --git a/config/clusters/linked-earth/common.values.yaml b/config/clusters/linked-earth/common.values.yaml
index 43a1012559..7b75154849 100644
--- a/config/clusters/linked-earth/common.values.yaml
+++ b/config/clusters/linked-earth/common.values.yaml
@@ -2,6 +2,7 @@ basehub:
   nfs:
     enabled: true
     pv:
+      enabled: true
       mountOptions:
         - soft
         - noatime
diff --git a/config/clusters/meom-ige/common.values.yaml b/config/clusters/meom-ige/common.values.yaml
index 0658f5c0cf..f1edae137b 100644
--- a/config/clusters/meom-ige/common.values.yaml
+++ b/config/clusters/meom-ige/common.values.yaml
@@ -1,6 +1,8 @@
 basehub:
   nfs:
+    enabled: true
     pv:
+      enabled: true
       # from https://docs.aws.amazon.com/efs/latest/ug/mounting-fs-nfs-mount-settings.html
       mountOptions:
         - rsize=1048576
diff --git a/config/clusters/nasa-cryo/common.values.yaml b/config/clusters/nasa-cryo/common.values.yaml
index 1bf353f69c..5aeb6bf4c5 100644
--- a/config/clusters/nasa-cryo/common.values.yaml
+++ b/config/clusters/nasa-cryo/common.values.yaml
@@ -1,6 +1,8 @@
 basehub:
   nfs:
+    enabled: true
     pv:
+      enabled: true
       # from https://docs.aws.amazon.com/efs/latest/ug/mounting-fs-nfs-mount-settings.html
       mountOptions:
         - rsize=1048576
diff --git a/config/clusters/nasa-esdis/common.values.yaml b/config/clusters/nasa-esdis/common.values.yaml
index f4ff89d4ac..684f24ab78 100644
--- a/config/clusters/nasa-esdis/common.values.yaml
+++ b/config/clusters/nasa-esdis/common.values.yaml
@@ -1,5 +1,7 @@
 nfs:
+  enabled: true
   pv:
+    enabled: true
     # from https://docs.aws.amazon.com/efs/latest/ug/mounting-fs-nfs-mount-settings.html
     mountOptions:
       - rsize=1048576
diff --git a/config/clusters/nasa-ghg/common.values.yaml b/config/clusters/nasa-ghg/common.values.yaml
index fefeb6b8ba..4be9b5979c 100644
--- a/config/clusters/nasa-ghg/common.values.yaml
+++ b/config/clusters/nasa-ghg/common.values.yaml
@@ -1,9 +1,11 @@
 basehub:
   nfs:
+    enabled: true
     # FIXME: Enable after https://github.com/yuvipanda/prometheus-dirsize-exporter/pull/7 is used
     dirsizeReporter:
       enabled: false
     pv:
+      enabled: true
       # from https://docs.aws.amazon.com/efs/latest/ug/mounting-fs-nfs-mount-settings.html
       mountOptions:
         - rsize=1048576
diff --git a/config/clusters/nasa-veda/common.values.yaml b/config/clusters/nasa-veda/common.values.yaml
index c18447580c..8db5536503 100644
--- a/config/clusters/nasa-veda/common.values.yaml
+++ b/config/clusters/nasa-veda/common.values.yaml
@@ -1,9 +1,11 @@
 basehub:
   nfs:
+    enabled: true
     # FIXME: Enable after https://github.com/yuvipanda/prometheus-dirsize-exporter/pull/7 is used
     dirsizeReporter:
       enabled: false
     pv:
+      enabled: true
       # from https://docs.aws.amazon.com/efs/latest/ug/mounting-fs-nfs-mount-settings.html
       mountOptions:
         - rsize=1048576
diff --git a/config/clusters/openscapes/common.values.yaml b/config/clusters/openscapes/common.values.yaml
index b92e54c8f5..aca5e3e2d6 100644
--- a/config/clusters/openscapes/common.values.yaml
+++ b/config/clusters/openscapes/common.values.yaml
@@ -1,6 +1,8 @@
 basehub:
   nfs:
+    enabled: true
     pv:
+      enabled: true
       # from https://docs.aws.amazon.com/efs/latest/ug/mounting-fs-nfs-mount-settings.html
       mountOptions:
         - rsize=1048576
diff --git a/config/clusters/pangeo-hubs/common.values.yaml b/config/clusters/pangeo-hubs/common.values.yaml
index 4dcfb502a3..96543bb828 100644
--- a/config/clusters/pangeo-hubs/common.values.yaml
+++ b/config/clusters/pangeo-hubs/common.values.yaml
@@ -2,6 +2,7 @@ basehub:
   nfs:
     enabled: true
     pv:
+      enabled: true
       mountOptions:
         - soft
         - noatime
diff --git a/config/clusters/qcl/common.values.yaml b/config/clusters/qcl/common.values.yaml
index 36f24213c8..502e40ef67 100644
--- a/config/clusters/qcl/common.values.yaml
+++ b/config/clusters/qcl/common.values.yaml
@@ -1,6 +1,7 @@
 nfs:
   enabled: true
   pv:
+    enabled: true
     mountOptions:
       - soft
       - noatime
diff --git a/config/clusters/smithsonian/common.values.yaml b/config/clusters/smithsonian/common.values.yaml
index 5c88521dc6..2851f71974 100644
--- a/config/clusters/smithsonian/common.values.yaml
+++ b/config/clusters/smithsonian/common.values.yaml
@@ -1,6 +1,8 @@
 basehub:
   nfs:
+    enabled: true
     pv:
+      enabled: true
       # from https://docs.aws.amazon.com/efs/latest/ug/mounting-fs-nfs-mount-settings.html
       mountOptions:
         - rsize=1048576
diff --git a/config/clusters/ubc-eoas/common.values.yaml b/config/clusters/ubc-eoas/common.values.yaml
index 65063fe49c..d0b3a5e431 100644
--- a/config/clusters/ubc-eoas/common.values.yaml
+++ b/config/clusters/ubc-eoas/common.values.yaml
@@ -1,8 +1,10 @@
 nfs:
+  enabled: true
   # FIXME: Enable after https://github.com/yuvipanda/prometheus-dirsize-exporter/pull/7 is used
   dirsizeReporter:
     enabled: false
   pv:
+    enabled: true
     # from https://docs.aws.amazon.com/efs/latest/ug/mounting-fs-nfs-mount-settings.html
     mountOptions:
       - rsize=1048576
diff --git a/config/clusters/utoronto/common.values.yaml b/config/clusters/utoronto/common.values.yaml
index 95f7ecb0a5..e71beb7a69 100644
--- a/config/clusters/utoronto/common.values.yaml
+++ b/config/clusters/utoronto/common.values.yaml
@@ -1,6 +1,7 @@
 nfs:
   enabled: true
   pv:
+    enabled: true
     # Recommended options from the Azure Portal UI for mounting the share
     mountOptions:
       - vers=4
diff --git a/config/clusters/victor/common.values.yaml b/config/clusters/victor/common.values.yaml
index f84eb373c3..e1fee7785f 100644
--- a/config/clusters/victor/common.values.yaml
+++ b/config/clusters/victor/common.values.yaml
@@ -1,6 +1,8 @@
 basehub:
   nfs:
+    enabled: true
     pv:
+      enabled: true
       # from https://docs.aws.amazon.com/efs/latest/ug/mounting-fs-nfs-mount-settings.html
       mountOptions:
         - rsize=1048576
diff --git a/docs/howto/features/ephemeral.md b/docs/howto/features/ephemeral.md
index b2e357d390..5c403be862 100644
--- a/docs/howto/features/ephemeral.md
+++ b/docs/howto/features/ephemeral.md
@@ -47,9 +47,10 @@ As users are temporary and can not be accessed again, there is no reason to
 provide persistent storage. So we turn it all off - particularly the home directories.
 
 ```yaml
+# nfs functionality explicitly disabled in case a common.values.yaml
+# file is used to enable it for all hubs in the cluster
 nfs:
   enabled: false
-  # Required until https://github.com/2i2c-org/infrastructure/issues/3654 is fixed
   pv:
     enabled: false
 
@@ -79,11 +80,11 @@ ephemeral hub's users.
    pointing to, with the following config:
 
    ```yaml
+   # nfs functionality enabled for this ephemeral hub to mount
+   # a shared folder from another hub in the cluster
    nfs:
      enabled: true
      dirsizeReporter:
-       # We don't need to report directory sizes here, as it's already being reported on by
-       # the 'source' hub
        enabled: false
      pv:
        enabled: true
diff --git a/helm-charts/basehub/values.yaml b/helm-charts/basehub/values.yaml
index f157f0f4c9..61d3a5df01 100644
--- a/helm-charts/basehub/values.yaml
+++ b/helm-charts/basehub/values.yaml
@@ -64,14 +64,14 @@ staticWebsite:
       privateKey: ""
 
 nfs:
-  enabled: true
+  enabled: false
   dirsizeReporter:
     enabled: true
   shareCreator:
     enabled: true
     tolerations: []
   pv:
-    enabled: true
+    enabled: false
     mountOptions:
       - soft
       - noatime