diff --git a/Makefile b/Makefile
index e9c6ea68f5c..8b52f5f2b39 100644
--- a/Makefile
+++ b/Makefile
@@ -105,7 +105,7 @@ clean:
 #----------------------------------------------------------------------------------
 
 .PHONY: manifests
-manifests: install/kube/install.yaml
+manifests: install/kube/install.yaml install/openshift/install.yaml
 
 install/kube/install.yaml: $(shell find install/helm/ -name '*.yaml')
 	cat install/helm/bootstrap.yaml \
@@ -118,6 +118,11 @@ install/kube/install.yaml: $(shell find install/helm/ -name '*.yaml')
 		sed s/REMOVEME-//g | \
 		sed '/^.*REMOVEME$$/d' >> $@
 
+install/openshift/install.yaml: install/kube/install.yaml
+	cat install/kube/install.yaml \
+	  | sed -e "s@apps/v1beta2@extensions/v1beta1@" \
+	  | sed -e "s@rbac.authorization.k8s.io/v1@rbac.authorization.k8s.io/v1beta1@" > $@
+
 #----------------------------------------------------------------------------------
 # Docs
 #----------------------------------------------------------------------------------
diff --git a/install/openshift/install.yml b/install/openshift/install.yaml
similarity index 87%
rename from install/openshift/install.yml
rename to install/openshift/install.yaml
index d21b01c28e9..df49cf4419d 100644
--- a/install/openshift/install.yml
+++ b/install/openshift/install.yaml
@@ -4,6 +4,7 @@ apiVersion: v1
 kind: Namespace
 metadata:
   name: gloo-system
+
 ---
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
@@ -18,6 +19,7 @@ spec:
     singular: upstream
   scope: Namespaced
   version: v1
+
 ---
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
@@ -32,6 +34,7 @@ spec:
     singular: virtualservice
   scope: Namespaced
   version: v1
+
 ---
 # Source: gloo/templates/ingress-configmap.yaml
 apiVersion: v1
@@ -57,8 +60,8 @@ data:
     dynamic_resources:
       ads_config:
         api_type: GRPC
-        cluster_names:
-        - xds_cluster
+        grpc_services:
+        - envoy_grpc: {cluster_name: xds_cluster}
       cds_config:
         ads: {}
       lds_config:
@@ -148,23 +151,20 @@ metadata:
   namespace: gloo-system
   labels:
     gloo: control-plane
-    release: test
 spec:
   replicas: 1
   selector:
     matchLabels:
       gloo: control-plane
-      release: test
   template:
     metadata:
       labels:
         gloo: control-plane
-        release: test
     spec:
       containers:
       - name: control-plane
-        image: "soloio/control-plane:dev"
-        imagePullPolicy: Always
+        image: "soloio/control-plane:0.2.4"
+        imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 8081
           name: http
@@ -190,7 +190,6 @@ metadata:
   namespace: gloo-system
   labels:
     gloo: control-plane
-    release: test
 spec:
   ports:
     - port: 8081
@@ -198,7 +197,6 @@ spec:
       name: http
   selector:
     gloo: control-plane
-    release: test
 ---
 # Source: gloo/templates/function-discovery.yaml
 
@@ -209,23 +207,20 @@ metadata:
   namespace: gloo-system
   labels:
     gloo: function-discovery
-    release: test
 spec:
   replicas: 1
   selector:
     matchLabels:
       gloo: function-discovery
-      release: test
   template:
     metadata:
       labels:
         gloo: function-discovery
-        release: test
     spec:
       containers:
       - name: function-discovery
-        image: "soloio/function-discovery:dev"
-        imagePullPolicy: Always
+        image: "soloio/function-discovery:0.2.4"
+        imagePullPolicy: IfNotPresent
         env:
         - name: GRPC_TRACE
           value: "all"
@@ -245,22 +240,19 @@ spec:
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: ingress
+  name: ingress 
   namespace: gloo-system
   labels:
     gloo: ingress
-    release: test
 spec:
   replicas: 1
   selector:
     matchLabels:
       gloo: ingress
-      release: test
   template:
     metadata:
       labels:
         gloo: ingress
-        release: test
     spec:
       initContainers:
       - name: assignnodeid
@@ -287,12 +279,12 @@ spec:
               fieldPath: metadata.namespace
       containers:
       - name: envoy
-        image: "soloio/envoy:dev"
-        imagePullPolicy: Always
-        ports:
+        image: "soloio/envoy:v0.1.6-127"
+        imagePullPolicy: IfNotPresent
+        ports: 
         - containerPort: 8080
           name: http
-        - containerPort: 8443
+        - containerPort: 8443 
           name: https
         - containerPort: 19000
           name: admin
@@ -316,9 +308,8 @@ metadata:
   namespace: gloo-system
   labels:
     gloo: ingress
-    release: test
 spec:
-  type: NodePort
+  type: LoadBalancer
   ports:
     - port: 8080
       protocol: TCP
@@ -326,12 +317,9 @@ spec:
     - port: 8443
       protocol: TCP
       name: https
-    - port: 19000
-      protocol: TCP
-      name: admin
+    
   selector:
     gloo: ingress
-    release: test
 ---
 # Source: gloo/templates/kube-ingress-controller.yaml
 
@@ -342,22 +330,19 @@ metadata:
   namespace: gloo-system
   labels:
     gloo: kube-ingress-controller
-    release: test
 spec:
   selector:
     matchLabels:
       gloo: kube-ingress-controller
-      release: test
   replicas: 1
   template:
     metadata:
       labels:
         gloo: kube-ingress-controller
-        release: test
     spec:
       containers:
-      - image: "soloio/kube-ingress-controller:dev"
-        imagePullPolicy: Always
+      - image: "soloio/kube-ingress-controller:0.2.4"
+        imagePullPolicy: IfNotPresent
         name: kube-ingress-controller
         env:
         - name: DEBUG
@@ -371,29 +356,29 @@ spec:
         - "--kube.namespace=gloo-system"
 
 ---
-# Source: gloo/templates/kube-upstream-discovery.yaml
+# Source: gloo/templates/upstream-discovery.yaml
 
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   labels:
-    gloo: kube-upstream-discovery
-  name: service-discovery
+    gloo: upstream-discovery
+  name: upstream-discovery
   namespace: gloo-system
 spec:
   selector:
     matchLabels:
-      gloo: kube-upstream-discovery
+      gloo: upstream-discovery
   replicas: 1
   template:
     metadata:
       labels:
-        gloo: kube-upstream-discovery
+        gloo: upstream-discovery
     spec:
       containers:
-      - image: soloio/kube-upstream-discovery:dev
-        imagePullPolicy: Always
-        name: kube-upstream-discovery
+      - image: soloio/upstream-discovery:0.2.4
+        imagePullPolicy: IfNotPresent
+        name: upstream-discovery
         env:
         - name: GRPC_TRACE
           value: "all"