diff --git a/playbooks/openshift-apps/openscanhub.yml b/playbooks/openshift-apps/openscanhub.yml
index fd297c5add..80df66ab96 100644
--- a/playbooks/openshift-apps/openscanhub.yml
+++ b/playbooks/openshift-apps/openscanhub.yml
@@ -65,7 +65,7 @@
     when: env == "production"
   - role: openshift/object
     app: openscanhub
-    file: deployment-fedora-osh-hub.yml
+    template: deployment-fedora-osh-hub.yml
     objectname: deployment-fedora-osh-hub
     when: env == "staging"
   - role: openshift/object
@@ -123,17 +123,17 @@
     when: env == "staging"
   - role: openshift/object
     app: openscanhub
-    file: deployment-resalloc-server.yml
+    template: deployment-resalloc-server.yml
     objectname: deployment-resalloc-server
     when: env == "staging"
   - role: openshift/object
     app: openscanhub
-    file: route-resalloc-server.yml
+    template: route-resalloc-server.yml
     objectname: route-resalloc-server
     when: env == "staging"
   - role: openshift/object
     app: openscanhub
-    file: service-resalloc-server.yml
+    template: service-resalloc-server.yml
     objectname: service-resalloc-server
     when: env == "staging"
 
diff --git a/roles/openshift-apps/openscanhub/files/deployment-fedora-osh-hub.yml b/roles/openshift-apps/openscanhub/templates/deployment-fedora-osh-hub.yml
similarity index 96%
rename from roles/openshift-apps/openscanhub/files/deployment-fedora-osh-hub.yml
rename to roles/openshift-apps/openscanhub/templates/deployment-fedora-osh-hub.yml
index 40c949adda..43f6b3db91 100644
--- a/roles/openshift-apps/openscanhub/files/deployment-fedora-osh-hub.yml
+++ b/roles/openshift-apps/openscanhub/templates/deployment-fedora-osh-hub.yml
@@ -19,7 +19,7 @@ spec:
         deployment: fedora-osh-hub
     spec:
       containers:
-      - image: quay.io/openscanhub-fedora-infra/ocp:staging
+      - image: quay.io/openscanhub-fedora-infra/ocp:{{ env }}
         imagePullPolicy: Always
         name: fedora-osh-hub
         volumeMounts:
diff --git a/roles/openshift-apps/openscanhub/files/deployment-resalloc-server.yml b/roles/openshift-apps/openscanhub/templates/deployment-resalloc-server.yml
similarity index 99%
rename from roles/openshift-apps/openscanhub/files/deployment-resalloc-server.yml
rename to roles/openshift-apps/openscanhub/templates/deployment-resalloc-server.yml
index 9da20d591e..67c7ee83f1 100644
--- a/roles/openshift-apps/openscanhub/files/deployment-resalloc-server.yml
+++ b/roles/openshift-apps/openscanhub/templates/deployment-resalloc-server.yml
@@ -25,7 +25,7 @@ spec:
         deployment: resalloc-server
     spec:
       containers:
-      - image: quay.io/openscanhub-fedora-infra/resalloc-server:staging
+      - image: quay.io/openscanhub-fedora-infra/resalloc-server:{{ env }}
         imagePullPolicy: Always
         name: resalloc-server
         ports:
diff --git a/roles/openshift-apps/openscanhub/files/route-resalloc-server.yml b/roles/openshift-apps/openscanhub/templates/route-resalloc-server.yml
similarity index 90%
rename from roles/openshift-apps/openscanhub/files/route-resalloc-server.yml
rename to roles/openshift-apps/openscanhub/templates/route-resalloc-server.yml
index daf2ff6aaf..7888e1c467 100644
--- a/roles/openshift-apps/openscanhub/files/route-resalloc-server.yml
+++ b/roles/openshift-apps/openscanhub/templates/route-resalloc-server.yml
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/instance: resalloc-server
     app.kubernetes.io/name: resalloc-server
     app.kubernetes.io/part-of: openscanhub
-    app.openshift.io/runtime-version: staging
+    app.openshift.io/runtime-version: {{ env }}
   name: resalloc-server
   namespace: openscanhub
 spec:
diff --git a/roles/openshift-apps/openscanhub/files/service-resalloc-server.yml b/roles/openshift-apps/openscanhub/templates/service-resalloc-server.yml
similarity index 92%
rename from roles/openshift-apps/openscanhub/files/service-resalloc-server.yml
rename to roles/openshift-apps/openscanhub/templates/service-resalloc-server.yml
index 387a19a912..e9dc1ad13f 100644
--- a/roles/openshift-apps/openscanhub/files/service-resalloc-server.yml
+++ b/roles/openshift-apps/openscanhub/templates/service-resalloc-server.yml
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/instance: resalloc-server
     app.kubernetes.io/name: resalloc-server
     app.kubernetes.io/part-of: openscanhub
-    app.openshift.io/runtime-version: staging
+    app.openshift.io/runtime-version: {{ env }}
   name: resalloc-server
   namespace: openscanhub
 spec: