diff --git a/roles/openshift-apps/firmitas/tasks/create-imagestream.yml b/roles/openshift-apps/firmitas/tasks/create-imagestream.yml
new file mode 100644
index 0000000000..40a3e5b9bc
--- /dev/null
+++ b/roles/openshift-apps/firmitas/tasks/create-imagestream.yml
@@ -0,0 +1,11 @@
+---
+# generate the templates for project to be created
+- name: create the imagestream template
+  template:
+    src: "imagestream.yml"
+    dest: "/root/ocp4/openshift-apps/firmitas/imagestream.yml"
+    mode: 0770
+
+# apply created openshift resources
+- name: oc apply resources
+  command: "/root/bin/oc apply -f /root/ocp4/openshift-apps/firmitas/imagestream.yml"
diff --git a/roles/openshift-apps/firmitas/tasks/main.yml b/roles/openshift-apps/firmitas/tasks/main.yml
index 85cbf431ad..eddf9cf20e 100644
--- a/roles/openshift-apps/firmitas/tasks/main.yml
+++ b/roles/openshift-apps/firmitas/tasks/main.yml
@@ -3,5 +3,6 @@
 - include_tasks: create-namespace.yml
 - include_tasks: create-pagure-apikey-secret.yml
 - include_tasks: create-persistent-volume-claim.yml
+- include_tasks: create-imagestream.yml
 - include_tasks: create-buildconfig.yml
 - include_tasks: create-deployment.yml
diff --git a/roles/openshift-apps/firmitas/templates/imagestream.yml b/roles/openshift-apps/firmitas/templates/imagestream.yml
new file mode 100644
index 0000000000..a599382179
--- /dev/null
+++ b/roles/openshift-apps/firmitas/templates/imagestream.yml
@@ -0,0 +1,7 @@
+---
+kind: ImageStream
+apiVersion: image.openshift.io/v1
+metadata:
+  name: "{{ firmitas_application_name }}"
+  namespace: "{{ firmitas_namespace }}"
+