diff --git a/roles/openshift-apps/greenwave/files/imagestream.yml b/roles/openshift-apps/greenwave/files/imagestream.yml
index acae563aa1..a0084b5d46 100644
--- a/roles/openshift-apps/greenwave/files/imagestream.yml
+++ b/roles/openshift-apps/greenwave/files/imagestream.yml
@@ -2,3 +2,13 @@ apiVersion: v1
 kind: ImageStream
 metadata:
   name: "greenwave"
+{% if env == 'staging' %}
+spec:¬
+  tags:¬
+  - name: latest¬
+    importPolicy:¬
+      scheduled: true¬
+    from:¬
+      kind: DockerImage¬
+      name: quay.io/factory2/greenwave:latest
+{% endif %}
diff --git a/roles/openshift-apps/greenwave/templates/imagestreamtag.yml b/roles/openshift-apps/greenwave/templates/imagestreamtag.yml
deleted file mode 100644
index 8bd13464df..0000000000
--- a/roles/openshift-apps/greenwave/templates/imagestreamtag.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-- apiVersion: v1
-  generation: 5
-  kind: ImageStreamTag
-  lookupPolicy:
-    local: false
-  metadata:
-    creationTimestamp: null
-    name: greenwave:latest
-  tag:
-    annotations: null
-    from:
-      kind: DockerImage
-      name: quay.io/factory2/greenwave:latest
-    generation: 5
-    importPolicy:
-      scheduled: true
-    name: latest
-    referencePolicy:
-      type: Source