diff --git a/playbooks/openshift-apps/flatpak-indexer.yml b/playbooks/openshift-apps/flatpak-indexer.yml
index d02f75e5ad..42df2113a0 100644
--- a/playbooks/openshift-apps/flatpak-indexer.yml
+++ b/playbooks/openshift-apps/flatpak-indexer.yml
@@ -33,7 +33,7 @@
 
   - role: openshift/object
     app: flatpak-indexer
-    file: storage.yml
+    template: storage.yml
     objectname: storage.yml
 
   - role: openshift/object
diff --git a/roles/openshift-apps/flatpak-indexer/files/storage.yml b/roles/openshift-apps/flatpak-indexer/files/storage.yml
deleted file mode 100644
index 8384d5e5fb..0000000000
--- a/roles/openshift-apps/flatpak-indexer/files/storage.yml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: flatpak-indexer-storage
-spec:
-  accessModes:
-    - ReadWriteMany
-  resources:
-    requests:
-      storage: 5Gi
-  storageClassName: ""
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: flatpak-indexer-redis-storage
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 5Gi
-  storageClassName: ""
diff --git a/roles/openshift-apps/flatpak-indexer/templates/deploymentconfig.yml b/roles/openshift-apps/flatpak-indexer/templates/deploymentconfig.yml
index ad7b7e3014..5b5ccdc7c0 100644
--- a/roles/openshift-apps/flatpak-indexer/templates/deploymentconfig.yml
+++ b/roles/openshift-apps/flatpak-indexer/templates/deploymentconfig.yml
@@ -63,7 +63,7 @@ spec:
         name: koji-conf-volume
       - name: index-output-volume
         persistentVolumeClaim:
-          claimName: flatpak-indexer-storage
+          claimName: flatpak-indexer-storage{{ '-stg' if env == 'staging' else '' }}
   test: false
   triggers:
   - type: ConfigChange
@@ -142,7 +142,7 @@ spec:
         name: indexer-config-volume
       - name: index-output-volume
         persistentVolumeClaim:
-          claimName: flatpak-indexer-storage
+          claimName: flatpak-indexer-storage{{ '-stg' if env == 'staging' else '' }}
   test: false
   triggers:
   - type: ConfigChange
@@ -214,7 +214,7 @@ spec:
       volumes:
       - name: redis-data-volume
         persistentVolumeClaim:
-          claimName: flatpak-indexer-redis-storage
+          claimName: flatpak-indexer-redis-storage{{ '-stg' if env == 'staging' else '' }}
   test: false
   triggers:
   - type: ConfigChange
diff --git a/roles/openshift-apps/flatpak-indexer/templates/storage.yml b/roles/openshift-apps/flatpak-indexer/templates/storage.yml
new file mode 100644
index 0000000000..d385be62d5
--- /dev/null
+++ b/roles/openshift-apps/flatpak-indexer/templates/storage.yml
@@ -0,0 +1,24 @@
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: flatpak-indexer-storage{{ '-stg' if env == 'staging' else '' }}
+spec:
+  accessModes:
+    - ReadWriteMany
+  resources:
+    requests:
+      storage: 5Gi
+  volumeName: flatpak-indexer-redis-storage{{ '-stg' if env == 'staging' else '' }}
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: flatpak-indexer-redis-storage{{ '-stg' if env == 'staging' else '' }}
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 1Gi
+  volumeName: flatpak-indexer-redis-storage{{ '-stg' if env == 'staging' else '' }}