diff --git a/examples_test.go b/examples_test.go
index 5e65872b..04b856c6 100644
--- a/examples_test.go
+++ b/examples_test.go
@@ -265,11 +265,11 @@ func TestExampleObjectSchemas(t *testing.T) {
 		},
 		"../examples/openshift-origin": {
 			"openshift-origin-namespace": &api.Namespace{},
-			"openshift-controller":       &api.ReplicationController{},
+			"openshift-controller":       &extensions.Deployment{},
 			"openshift-service":          &api.Service{},
-			"etcd-controller":            &api.ReplicationController{},
+			"etcd-controller":            &extensions.Deployment{},
 			"etcd-service":               &api.Service{},
-			"etcd-discovery-controller":  &api.ReplicationController{},
+			"etcd-discovery-controller":  &extensions.Deployment{},
 			"etcd-discovery-service":     &api.Service{},
 			"secret":                     nil,
 		},
diff --git a/openshift-origin/etcd-controller.yaml b/openshift-origin/etcd-controller.yaml
index c9bd62b3..419c57db 100644
--- a/openshift-origin/etcd-controller.yaml
+++ b/openshift-origin/etcd-controller.yaml
@@ -1,20 +1,16 @@
-kind: ReplicationController
-apiVersion: v1
+apiVersion: extensions/v1beta1
+kind: Deployment
 metadata:
   name: etcd
-  creationTimestamp: 
 spec:
   strategy:
     type: Recreate
-    resources: {}
-  triggers:
-  - type: ConfigChange
   replicas: 3
   selector:
-    name: etcd
+    matchLabels:
+      name: etcd
   template:
     metadata:
-      creationTimestamp: 
       labels:
         name: etcd
     spec:
@@ -47,7 +43,6 @@ spec:
         resources: {}
         terminationMessagePath: "/dev/termination-log"
         imagePullPolicy: IfNotPresent
-        capabilities: {}
         securityContext:
           capabilities: {}
           privileged: false
diff --git a/openshift-origin/etcd-discovery-controller.yaml b/openshift-origin/etcd-discovery-controller.yaml
index 9ed81726..33f593ac 100644
--- a/openshift-origin/etcd-discovery-controller.yaml
+++ b/openshift-origin/etcd-discovery-controller.yaml
@@ -1,20 +1,16 @@
-kind: ReplicationController
-apiVersion: v1
+apiVersion: extensions/v1beta1
+kind: Deployment
 metadata:
   name: etcd-discovery
-  creationTimestamp: 
 spec:
   strategy:
     type: Recreate
-    resources: {}
-  triggers:
-  - type: ConfigChange
   replicas: 1
   selector:
-    name: etcd-discovery
+    matchLabels:
+      name: etcd-discovery
   template:
     metadata:
-      creationTimestamp: 
       labels:
         name: etcd-discovery
     spec:
@@ -29,7 +25,6 @@ spec:
         resources: {}
         terminationMessagePath: "/dev/termination-log"
         imagePullPolicy: IfNotPresent
-        capabilities: {}
         securityContext:
           capabilities: {}
           privileged: false
diff --git a/openshift-origin/etcd-discovery-service.yaml b/openshift-origin/etcd-discovery-service.yaml
index 2c157711..99f46471 100644
--- a/openshift-origin/etcd-discovery-service.yaml
+++ b/openshift-origin/etcd-discovery-service.yaml
@@ -2,7 +2,6 @@ kind: Service
 apiVersion: v1
 metadata:
   name: etcd-discovery
-  creationTimestamp: 
   labels:
     name: etcd-discovery
 spec:
diff --git a/openshift-origin/etcd-service.yaml b/openshift-origin/etcd-service.yaml
index ed4fc27b..00bc56ef 100644
--- a/openshift-origin/etcd-service.yaml
+++ b/openshift-origin/etcd-service.yaml
@@ -2,7 +2,6 @@ kind: Service
 apiVersion: v1
 metadata:
   name: etcd
-  creationTimestamp: 
   labels:
     name: etcd
 spec:
diff --git a/openshift-origin/openshift-controller.yaml b/openshift-origin/openshift-controller.yaml
index 65252747..5ae604f9 100644
--- a/openshift-origin/openshift-controller.yaml
+++ b/openshift-origin/openshift-controller.yaml
@@ -1,13 +1,14 @@
-apiVersion: v1
-kind: ReplicationController
+apiVersion: extensions/v1beta1
+kind: Deployment
 metadata: 
   labels: 
     name: openshift
   name: openshift
 spec: 
   replicas: 1
-  selector: 
-    name: openshift
+  selector:
+    matchLabels:
+      name: openshift
   template: 
     metadata: 
       labels: