diff --git a/roles/openshift-apps/languages/templates/cron.yml b/roles/openshift-apps/languages/templates/cron.yml
index ba46bfef08..f9abe2629b 100644
--- a/roles/openshift-apps/languages/templates/cron.yml
+++ b/roles/openshift-apps/languages/templates/cron.yml
@@ -32,7 +32,7 @@ spec:
           volumes:
           - name: srpm-data
             persistentVolumeClaim:
-              claimName: "{{ app }}-storage"
+              claimName: "languages-storage{{ '-stg' if env == 'staging' else '' }}"
           restartPolicy: Never
 ---
 {% endif %}
@@ -69,7 +69,7 @@ spec:
           volumes:
           - name: srpm-data
             persistentVolumeClaim:
-              claimName: "{{ app }}-storage"
+              claimName: "languages-storage{{ '-stg' if env == 'staging' else '' }}"
           restartPolicy: Never
 ---
 {% if env == "production" %}
@@ -94,7 +94,7 @@ spec:
           volumes:
           - name: srpm-data
             persistentVolumeClaim:
-              claimName: "{{ app }}-storage"
+              claimName: "languages-storage{{ '-stg' if env == 'staging' else '' }}"
           restartPolicy: Never
           containers:
           - name: stats
@@ -134,7 +134,7 @@ spec:
           volumes:
           - name: srpm-data
             persistentVolumeClaim:
-              claimName: "{{ app }}-storage"
+              claimName: "languages-storage{{ '-stg' if env == 'staging' else '' }}"
           restartPolicy: Never
           containers:
           - name: stats
@@ -173,7 +173,7 @@ spec:
           volumes:
           - name: srpm-data
             persistentVolumeClaim:
-              claimName: "{{ app }}-storage"
+              claimName: "languages-storage{{ '-stg' if env == 'staging' else '' }}"
           restartPolicy: Never
           containers:
           - name: stats
@@ -226,4 +226,4 @@ spec:
           volumes:
           - name: nginx-data
             persistentVolumeClaim:
-              claimName: "{{ app }}-storage"
+              claimName: "languages-storage{{ '-stg' if env == 'staging' else '' }}"
diff --git a/roles/openshift-apps/languages/templates/deploymentconfig.yml b/roles/openshift-apps/languages/templates/deploymentconfig.yml
index 2f115d319b..89ee07e6e4 100644
--- a/roles/openshift-apps/languages/templates/deploymentconfig.yml
+++ b/roles/openshift-apps/languages/templates/deploymentconfig.yml
@@ -34,6 +34,6 @@ spec:
       volumes:
       - name: nginx-data
         persistentVolumeClaim:
-          claimName: "{{ app }}-storage"
+          claimName: "languages-storage{{ '-stg' if env == 'staging' else '' }}"
       restartPolicy: Always
 
diff --git a/roles/openshift-apps/languages/templates/pvc.yml b/roles/openshift-apps/languages/templates/pvc.yml
index ce09b9baad..27172bc225 100644
--- a/roles/openshift-apps/languages/templates/pvc.yml
+++ b/roles/openshift-apps/languages/templates/pvc.yml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: "{{ app }}-storage"
+  name: "languages-storage{{ '-stg' if env == 'staging' else '' }}"
 spec:
   accessModes:
     - ReadWriteMany
@@ -13,3 +13,4 @@ spec:
       storage: 70Gi
 {%    endif %}
   storageClassName: ""
+  volumeName: "languages-storage{{ '-stg' if env == 'staging' else '' }}"