diff --git a/xos-core/templates/50-rbac.yaml b/xos-core/templates/50-rbac.yaml
index fd4bde0..5e145ec 100644
--- a/xos-core/templates/50-rbac.yaml
+++ b/xos-core/templates/50-rbac.yaml
@@ -18,7 +18,7 @@
 metadata:
   name: kubernetes-synchronizer
 ---
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: kubernetes-synchronizer-cluster-admin
diff --git a/xos-core/templates/chameleon-deployment.yaml b/xos-core/templates/chameleon-deployment.yaml
index a715a98..5ae86ec 100644
--- a/xos-core/templates/chameleon-deployment.yaml
+++ b/xos-core/templates/chameleon-deployment.yaml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: xos-chameleon
@@ -21,6 +21,10 @@
     {{- include "xos-core.release_labels" . | indent 4 }}
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      name: xos-chameleon
+      release: {{ .Release.Name }}
   template:
     metadata:
       labels:
diff --git a/xos-core/templates/core-deployment.yaml b/xos-core/templates/core-deployment.yaml
index a8625e2..86b6a0f 100644
--- a/xos-core/templates/core-deployment.yaml
+++ b/xos-core/templates/core-deployment.yaml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: xos-core
@@ -21,6 +21,10 @@
     {{- include "xos-core.release_labels" . | indent 4 }}
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      name: xos-core
+      release: {{ .Release.Name }}
   template:
     metadata:
       labels:
@@ -79,4 +83,3 @@
             items:
               - key: config
                 path: migrations/initial_data.yaml
-
diff --git a/xos-core/templates/tosca-deployment.yaml b/xos-core/templates/tosca-deployment.yaml
index c6f8376..10a613b 100644
--- a/xos-core/templates/tosca-deployment.yaml
+++ b/xos-core/templates/tosca-deployment.yaml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: xos-tosca
@@ -21,6 +21,10 @@
     {{- include "xos-core.release_labels" . | indent 4 }}
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      name: xos-tosca
+      release: {{ .Release.Name }}
   template:
     metadata:
       labels: