diff --git a/galaxy/templates/deployment-celery-beat.yaml b/galaxy/templates/deployment-celery-beat.yaml
index 0f46248d..28795db7 100644
--- a/galaxy/templates/deployment-celery-beat.yaml
+++ b/galaxy/templates/deployment-celery-beat.yaml
@@ -139,8 +139,8 @@ spec:
             {{- if .Values.refdata.enabled }}
             - name: refdata-gxy
               mountPath: /cvmfs/data.galaxyproject.org
-              subPath: data.galaxyproject.org
             {{- if eq .Values.refdata.type "cvmfs" }}
+              subPath: data.galaxyproject.org
               # CVMFS automount volumes must be mounted with HostToContainer mount propagation.
               mountPropagation: HostToContainer
             {{- end }}
diff --git a/galaxy/templates/deployment-celery.yaml b/galaxy/templates/deployment-celery.yaml
index 100b4ac6..5eb27cca 100644
--- a/galaxy/templates/deployment-celery.yaml
+++ b/galaxy/templates/deployment-celery.yaml
@@ -139,8 +139,8 @@ spec:
             {{- if .Values.refdata.enabled }}
             - name: refdata-gxy
               mountPath: /cvmfs/data.galaxyproject.org
-              subPath: data.galaxyproject.org
             {{- if eq .Values.refdata.type "cvmfs" }}
+              subPath: data.galaxyproject.org
               # CVMFS automount volumes must be mounted with HostToContainer mount propagation.
               mountPropagation: HostToContainer
             {{- end }}
diff --git a/galaxy/templates/deployment-job.yaml b/galaxy/templates/deployment-job.yaml
index 29988bd1..0b77a89b 100644
--- a/galaxy/templates/deployment-job.yaml
+++ b/galaxy/templates/deployment-job.yaml
@@ -146,8 +146,8 @@ spec:
             {{- if $.Values.refdata.enabled }}
             - name: refdata-gxy
               mountPath: /cvmfs/data.galaxyproject.org
-              subPath: data.galaxyproject.org
             {{- if eq $.Values.refdata.type "cvmfs" }}
+              subPath: data.galaxyproject.org
               # CVMFS automount volumes must be mounted with HostToContainer mount propagation.
               mountPropagation: HostToContainer
             {{- end }}
diff --git a/galaxy/templates/deployment-web.yaml b/galaxy/templates/deployment-web.yaml
index 783d1a52..c6be57bc 100644
--- a/galaxy/templates/deployment-web.yaml
+++ b/galaxy/templates/deployment-web.yaml
@@ -134,8 +134,8 @@ spec:
             {{- if .Values.refdata.enabled }}
             - name: refdata-gxy
               mountPath: /cvmfs/data.galaxyproject.org
-              subPath: data.galaxyproject.org
             {{- if eq .Values.refdata.type "cvmfs" }}
+              subPath: data.galaxyproject.org
               # CVMFS automount volumes must be mounted with HostToContainer mount propagation.
               mountPropagation: HostToContainer
             {{- end }}
diff --git a/galaxy/templates/deployment-workflow.yaml b/galaxy/templates/deployment-workflow.yaml
index b994fbc9..4d744214 100644
--- a/galaxy/templates/deployment-workflow.yaml
+++ b/galaxy/templates/deployment-workflow.yaml
@@ -143,8 +143,8 @@ spec:
             {{- if .Values.refdata.enabled }}
             - name: refdata-gxy
               mountPath: /cvmfs/data.galaxyproject.org
-              subPath: data.galaxyproject.org
             {{- if eq .Values.refdata.type "cvmfs" }}
+              subPath: data.galaxyproject.org
               # CVMFS automount volumes must be mounted with HostToContainer mount propagation.
               mountPropagation: HostToContainer
             {{- end }}
diff --git a/galaxy/templates/jobs-init.yaml b/galaxy/templates/jobs-init.yaml
index 92079e07..b78903bc 100644
--- a/galaxy/templates/jobs-init.yaml
+++ b/galaxy/templates/jobs-init.yaml
@@ -79,8 +79,8 @@ spec:
             {{- if .Values.refdata.enabled }}
             - name: refdata-gxy
               mountPath: /cvmfs/data.galaxyproject.org
-              subPath: data.galaxyproject.org
             {{- if eq .Values.refdata.type "cvmfs" }}
+              subPath: data.galaxyproject.org
               # CVMFS automount volumes must be mounted with HostToContainer mount propagation.
               mountPropagation: HostToContainer
             {{- end }}
@@ -187,8 +187,8 @@ spec:
             {{- if .Values.refdata.enabled }}
             - name: refdata-gxy
               mountPath: /cvmfs/data.galaxyproject.org
-              subPath: data.galaxyproject.org
             {{- if eq .Values.refdata.type "cvmfs" }}
+              subPath: data.galaxyproject.org
               # CVMFS automount volumes must be mounted with HostToContainer mount propagation.
               mountPropagation: HostToContainer
             {{- end }}