diff --git a/playbooks/openshift-apps/koschei.yml b/playbooks/openshift-apps/koschei.yml
index 489beb07fb..b18993d596 100644
--- a/playbooks/openshift-apps/koschei.yml
+++ b/playbooks/openshift-apps/koschei.yml
@@ -39,6 +39,7 @@
         template: "{{ item }}.yml"
         objectname: "{{ item }}.yml"
       with_items:
+        - imagestream
         - frontend-config
         - backend-config
         - frontend-deployment
diff --git a/roles/openshift-apps/koschei/templates/backend-deployment.yml b/roles/openshift-apps/koschei/templates/backend-deployment.yml
index a341e2f4fe..cbffc209ee 100644
--- a/roles/openshift-apps/koschei/templates/backend-deployment.yml
+++ b/roles/openshift-apps/koschei/templates/backend-deployment.yml
@@ -18,8 +18,7 @@ spec:
     spec:
       containers:
       - name: {{service}}
-        image: "{{ koschei_container_image }}"
-        imagePullPolicy: Always
+        image: koschei:latest
         command: [/usr/bin/koschei-{{service}}]
         env:
           - name: KRB5_CONFIG
diff --git a/roles/openshift-apps/koschei/templates/frontend-deployment.yml b/roles/openshift-apps/koschei/templates/frontend-deployment.yml
index fc89631137..841ff9e1c1 100644
--- a/roles/openshift-apps/koschei/templates/frontend-deployment.yml
+++ b/roles/openshift-apps/koschei/templates/frontend-deployment.yml
@@ -18,8 +18,7 @@ spec:
     spec:
       containers:
       - name: frontend
-        image: "{{ koschei_container_image }}"
-        imagePullPolicy: Always
+        image: koschei:latest
         command: [/usr/bin/koschei-frontend]
         ports:
         - containerPort: 8080
diff --git a/roles/openshift-apps/koschei/templates/imagestream.yml b/roles/openshift-apps/koschei/templates/imagestream.yml
new file mode 100644
index 0000000000..6d4ec7a6b7
--- /dev/null
+++ b/roles/openshift-apps/koschei/templates/imagestream.yml
@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: ImageStream
+metadata:
+   name: koschei
+spec:
+  tags:
+  - name: latest
+    from:
+      kind: DockerImage
+      name: "{{ koschei_container_image }}"