diff --git a/infrastructure/iris-gateway/templates/locations-postgres-backup/pvc.yaml b/infrastructure/iris-gateway/templates/locations-postgres-backup/pvc.yaml
index 032b50f9..807edca8 100644
--- a/infrastructure/iris-gateway/templates/locations-postgres-backup/pvc.yaml
+++ b/infrastructure/iris-gateway/templates/locations-postgres-backup/pvc.yaml
@@ -5,16 +5,10 @@ metadata:
   labels:
   {{- include "iris-gateway.locations-postgres-backup-labels" . | nindent 4 }}
 spec:
-{{- if (eq .Values.environment "test") }}
   accessModes:
     - ReadWriteMany
   storageClassName: ""
   volumeName: locations-postgres-backups
-{{- else }}
-  accessModes:
-    - ReadWriteOnce
-  storageClassName: managed-nfs-storage
-{{- end }}
   resources:
     requests:
       storage: 10Gi
diff --git a/infrastructure/iris-gateway/templates/locations-postgres/pvc.yaml b/infrastructure/iris-gateway/templates/locations-postgres/pvc.yaml
index ee89e490..b5a3c503 100644
--- a/infrastructure/iris-gateway/templates/locations-postgres/pvc.yaml
+++ b/infrastructure/iris-gateway/templates/locations-postgres/pvc.yaml
@@ -5,16 +5,10 @@ metadata:
   labels:
   {{- include "iris-gateway.locations-postgres-labels" . | nindent 4 }}
 spec:
-{{- if (eq .Values.environment "test") }}
   accessModes:
     - ReadWriteMany
   storageClassName: ""
   volumeName: locations-postgres
-{{- else }}
-  accessModes:
-    - ReadWriteOnce
-  storageClassName: managed-nfs-storage
-{{- end }}
   resources:
     requests:
       storage: 10Gi
diff --git a/infrastructure/iris-gateway/templates/public-proxy/pvc.yaml b/infrastructure/iris-gateway/templates/public-proxy/pvc.yaml
index 6e9609f4..2063bd6f 100644
--- a/infrastructure/iris-gateway/templates/public-proxy/pvc.yaml
+++ b/infrastructure/iris-gateway/templates/public-proxy/pvc.yaml
@@ -5,16 +5,10 @@ metadata:
   labels:
   {{- include "iris-gateway.public-proxy-labels" . | nindent 4 }}
 spec:
-{{- if (eq .Values.environment "test") }}
   accessModes:
     - ReadWriteMany
   storageClassName: ""
   volumeName: public-proxy
-{{- else }}
-  accessModes:
-    - ReadWriteOnce
-  storageClassName: managed-nfs-storage
-{{- end }}
   resources:
     requests:
       storage: 1Gi
diff --git a/infrastructure/iris-gateway/templates/service-directory/pvc.yaml b/infrastructure/iris-gateway/templates/service-directory/pvc.yaml
index 8dd4f151..8feea4ff 100644
--- a/infrastructure/iris-gateway/templates/service-directory/pvc.yaml
+++ b/infrastructure/iris-gateway/templates/service-directory/pvc.yaml
@@ -5,16 +5,10 @@ metadata:
   labels:
   {{- include "iris-gateway.service-directory-labels" . | nindent 4 }}
 spec:
-{{- if (eq .Values.environment "test") }}
   accessModes:
     - ReadWriteMany
   storageClassName: ""
   volumeName: service-directory
-{{- else }}
-  accessModes:
-    - ReadWriteOnce
-  storageClassName: managed-nfs-storage
-{{- end }}
   resources:
     requests:
       storage: 1Gi