diff --git a/playbooks/openshift-apps/debuginfod.yml b/playbooks/openshift-apps/debuginfod.yml
index 4bf007ffb4..b4b094aaa5 100644
--- a/playbooks/openshift-apps/debuginfod.yml
+++ b/playbooks/openshift-apps/debuginfod.yml
@@ -36,7 +36,7 @@
 
   - role: openshift/object
     app: debuginfod
-    file: storage.yml
+    template: storage.yml
     objectname: storage.yml
 
   - role: openshift/route
diff --git a/roles/openshift-apps/debuginfod/files/storage.yml b/roles/openshift-apps/debuginfod/templates/storage.yml
similarity index 73%
rename from roles/openshift-apps/debuginfod/files/storage.yml
rename to roles/openshift-apps/debuginfod/templates/storage.yml
index 0c9a495756..4009b4a279 100644
--- a/roles/openshift-apps/debuginfod/files/storage.yml
+++ b/roles/openshift-apps/debuginfod/templates/storage.yml
@@ -15,7 +15,7 @@ spec:
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: debuginfod-volume
+  name: debuginfod-storage{{ '-stg' if env == 'staging' else '' }}
 spec:
   storageClassName: ""
   accessModes:
@@ -23,4 +23,4 @@ spec:
   resources:
     requests:
       storage: 300Gi
-  volumeName: debuginfod-volume
+  volumeName: debuginfod-storage{{ '-stg' if env == 'staging' else '' }}