diff --git a/deployment/deployment-perme-failed-1.yaml b/deployment/deployment-perme-failed-1.yaml
index 2971263a..31c4b809 100644
--- a/deployment/deployment-perme-failed-1.yaml
+++ b/deployment/deployment-perme-failed-1.yaml
@@ -1,10 +1,13 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: hello-openshift
 spec:
   progressDeadlineSeconds: 30
   replicas: 2
+  selector:
+    matchLabels:
+      app: hello-openshift
   template:
     metadata:
       labels:
diff --git a/deployment/deployment-perme-failed-2.yaml b/deployment/deployment-perme-failed-2.yaml
index e8472b06..08cec4a1 100644
--- a/deployment/deployment-perme-failed-2.yaml
+++ b/deployment/deployment-perme-failed-2.yaml
@@ -1,8 +1,11 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: hello-openshift
 spec:
+  selector:
+    matchLabels:
+      app: hello-openshift
   progressDeadlineSeconds: 0
   replicas: 2
   template:
diff --git a/deployment/deployment-perme-failed-3.yaml b/deployment/deployment-perme-failed-3.yaml
index 4283bd64..f940f7ef 100644
--- a/deployment/deployment-perme-failed-3.yaml
+++ b/deployment/deployment-perme-failed-3.yaml
@@ -1,8 +1,11 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: hello-openshift
 spec:
+  selector:
+    matchLabels:
+      app: hello-openshift
   progressDeadlineSeconds: 30
   replicas: 2
   template:
diff --git a/deployment/manual.json b/deployment/manual.json
index e17204cb..d69d68bd 100644
--- a/deployment/manual.json
+++ b/deployment/manual.json
@@ -40,7 +40,7 @@
                 "containers": [
                     {
                         "name": "hello-openshift",
-                        "image": "openshift/hello-openshift",
+                        "image": "quay.io/openshifttest/hello-openshift:openshift",
                         "ports": [
                             {
                                 "containerPort": 8080,
diff --git a/replicaSet/tc533162/rs_endpoints.yaml b/replicaSet/tc533162/rs_endpoints.yaml
index c1424dbf..74fcfa2e 100644
--- a/replicaSet/tc533162/rs_endpoints.yaml
+++ b/replicaSet/tc533162/rs_endpoints.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: ReplicaSet
 metadata:
   name: frontend
diff --git a/statefulset/stable-storage.yaml b/statefulset/stable-storage.yaml
index 235e3b4e..6c0bbab8 100644
--- a/statefulset/stable-storage.yaml
+++ b/statefulset/stable-storage.yaml
@@ -14,13 +14,16 @@ spec:
   selector:
     app: hello-pod
 ---
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: hello-statefulset
 spec:
   serviceName: "foo"
   replicas: 2
+  selector:
+    matchLabels:
+      app: hello-pod
   template:
     metadata:
       labels: