diff --git a/playbooks/openshift-apps/bodhi.yml b/playbooks/openshift-apps/bodhi.yml
index cc435e51dd..b04e83c227 100644
--- a/playbooks/openshift-apps/bodhi.yml
+++ b/playbooks/openshift-apps/bodhi.yml
@@ -44,10 +44,9 @@
     key: fedmsg-bodhi.crt
     privatefile: fedmsg-certs/keys/bodhi-bodhi03.phx2.fedoraproject.org.crt
     when: env != "staging"
-  - role: openshift/object
+  - role: openshift/imagestream
     app: bodhi
-    file: imagestream.yml
-    objectname: imagestream.yml
+    imagestream: bodhi-web
   - role: openshift/object
     app: bodhi
     template: buildconfig.yml
diff --git a/roles/openshift/imagestream/tasks/main.yml b/roles/openshift/imagestream/tasks/main.yml
new file mode 100644
index 0000000000..7e5821cbf3
--- /dev/null
+++ b/roles/openshift/imagestream/tasks/main.yml
@@ -0,0 +1,7 @@
+---
+- name: route-{{routename}}.yml
+  include_role:
+    name: openshift/object
+  vars:
+    objectname: route-{{routename}}.yml
+    template_fullpath: "{{roles_path}}/openshift/route/templates/route.yml"
diff --git a/roles/openshift/imagestream/templates/imagestream.yml b/roles/openshift/imagestream/templates/imagestream.yml
new file mode 100644
index 0000000000..ec39c5cd38
--- /dev/null
+++ b/roles/openshift/imagestream/templates/imagestream.yml
@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: ImageStream
+metadata:
+  name: {{ imagename }}
diff --git a/roles/openshift/imagestream/templates/route.yml b/roles/openshift/imagestream/templates/route.yml
new file mode 100644
index 0000000000..e6d4e009fc
--- /dev/null
+++ b/roles/openshift/imagestream/templates/route.yml
@@ -0,0 +1,18 @@
+apiVersion: v1
+kind: Route
+metadata:
+  name: {{ routename }}
+  labels:
+    app: {{ app }}
+spec:
+  {% if host is defined %}
+  host: {{ host }}
+  {% endif %}
+  port:
+    targetPort: {{ serviceport }}
+  to:
+    kind: Service
+    name: {{ servicename }}
+  tls:
+    termination: edge
+    insecureEdgeTerminationPolicy: Redirect