diff --git a/galaxy/templates/deployment-nginx.yaml b/galaxy/templates/deployment-nginx.yaml
index 73aeae5c..7469e22b 100644
--- a/galaxy/templates/deployment-nginx.yaml
+++ b/galaxy/templates/deployment-nginx.yaml
@@ -65,12 +65,6 @@ spec:
               mountPath: {{ .Values.initJob.downloadToolConfs.volume.mountPath }}
               subPath: {{ .Values.initJob.downloadToolConfs.volume.subPath }}
             {{- end }}
-            {{- if .Values.cvmfs.enabled }}
-            {{- range $key, $entry := .Values.cvmfs.galaxyPersistentVolumeClaims }}
-            - name: cvmfs-gxy-{{ $key }}
-              mountPath: {{ $entry.mountPath }}
-            {{- end -}}
-            {{- end }}
             {{- if .Values.extraVolumeMounts }}
             {{- .Values.extraVolumeMounts | toYaml | nindent 12 }}
             {{- end }}
@@ -93,13 +87,6 @@ spec:
           {{- else }}
           emptyDir: {}
           {{- end }}
-        {{- if .Values.cvmfs.enabled }}
-        {{- range $key, $entry := .Values.cvmfs.galaxyPersistentVolumeClaims }}
-        - name: cvmfs-gxy-{{ $key }}
-          persistentVolumeClaim:
-            claimName: {{ template "galaxy.fullname" $ -}}-cvmfs-gxy-{{ $key }}-pvc
-        {{- end }}
-        {{- end }}
         {{- if .Values.extraVolumes }}
         {{- .Values.extraVolumes | toYaml | nindent 8 }}
         {{- end }}
diff --git a/galaxy/values.yaml b/galaxy/values.yaml
index 7e4b6bbe..95d8f12e 100644
--- a/galaxy/values.yaml
+++ b/galaxy/values.yaml
@@ -632,11 +632,20 @@ influxdb:
   password: ""
 
 nginx:
+  galaxyStaticDir: "/galaxy/server/static"
   image:
     repository: nginx
     tag: latest
     pullPolicy: IfNotPresent
   conf:
     client_max_body_size: 100g
-  galaxyStaticDir: "/galaxy/server/static"
-
+  resources:
+    # We recommend updating these based on the usage levels of the server
+    requests:
+      cpu: 100m
+      memory: 500M
+      ephemeral-storage: 10Gi
+    limits:
+      cpu: 2
+      memory: 3G
+      ephemeral-storage: 100Gi