diff --git a/test_scenarios/kubernetes/3idx1sh1cm-pvc/splunk-master-deploy-persistent.yaml b/test_scenarios/kubernetes/3idx1sh1cm-pvc/splunk-master-deploy-persistent.yaml
index 2b4f3d5d..0e5694cc 100644
--- a/test_scenarios/kubernetes/3idx1sh1cm-pvc/splunk-master-deploy-persistent.yaml
+++ b/test_scenarios/kubernetes/3idx1sh1cm-pvc/splunk-master-deploy-persistent.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: master
@@ -9,6 +9,11 @@ metadata:
     tier: management
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: splunk
+      role: splunk_cluster_master
+      tier: management
   template:
     metadata:
       labels:
diff --git a/test_scenarios/kubernetes/3idx1sh1cm-pvc/splunk-search-deploy-persistent.yaml b/test_scenarios/kubernetes/3idx1sh1cm-pvc/splunk-search-deploy-persistent.yaml
index 7c61e44e..c8a1c4b5 100644
--- a/test_scenarios/kubernetes/3idx1sh1cm-pvc/splunk-search-deploy-persistent.yaml
+++ b/test_scenarios/kubernetes/3idx1sh1cm-pvc/splunk-search-deploy-persistent.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: search
@@ -9,6 +9,11 @@ metadata:
     tier: search
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: splunk
+      role: splunk_search_head
+      tier: search
   template:
     metadata:
       labels:
diff --git a/test_scenarios/kubernetes/3idx1sh1cm/splunk-master-deploy-emptydir.yaml b/test_scenarios/kubernetes/3idx1sh1cm/splunk-master-deploy-emptydir.yaml
index 1a9196e7..7c407b24 100644
--- a/test_scenarios/kubernetes/3idx1sh1cm/splunk-master-deploy-emptydir.yaml
+++ b/test_scenarios/kubernetes/3idx1sh1cm/splunk-master-deploy-emptydir.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: master 
@@ -9,6 +9,11 @@ metadata:
     tier: management
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: splunk
+      role: splunk_cluster_master
+      tier: management
   template:
     metadata:
       labels:
diff --git a/test_scenarios/kubernetes/3idx1sh1cm/splunk-search-deploy-emptydir.yaml b/test_scenarios/kubernetes/3idx1sh1cm/splunk-search-deploy-emptydir.yaml
index e4b605ce..c88a0a1f 100644
--- a/test_scenarios/kubernetes/3idx1sh1cm/splunk-search-deploy-emptydir.yaml
+++ b/test_scenarios/kubernetes/3idx1sh1cm/splunk-search-deploy-emptydir.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: search 
@@ -9,6 +9,11 @@ metadata:
     tier: search
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: splunk
+      role: splunk_search_head
+      tier: search
   template:
     metadata:
       labels:
diff --git a/test_scenarios/kubernetes/3idxc3shc1cm1lm1dep-pvc/splunk-deployer-deploy-persistent.yaml b/test_scenarios/kubernetes/3idxc3shc1cm1lm1dep-pvc/splunk-deployer-deploy-persistent.yaml
index 16801619..f5bb8144 100644
--- a/test_scenarios/kubernetes/3idxc3shc1cm1lm1dep-pvc/splunk-deployer-deploy-persistent.yaml
+++ b/test_scenarios/kubernetes/3idxc3shc1cm1lm1dep-pvc/splunk-deployer-deploy-persistent.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: deployer
@@ -9,6 +9,11 @@ metadata:
     tier: management
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: splunk
+      role: splunk_deployer
+      tier: management
   template:
     metadata:
       labels:
diff --git a/test_scenarios/kubernetes/3idxc3shc1cm1lm1dep-pvc/splunk-license-deploy-persistent.yaml b/test_scenarios/kubernetes/3idxc3shc1cm1lm1dep-pvc/splunk-license-deploy-persistent.yaml
index 8a878496..22e47357 100644
--- a/test_scenarios/kubernetes/3idxc3shc1cm1lm1dep-pvc/splunk-license-deploy-persistent.yaml
+++ b/test_scenarios/kubernetes/3idxc3shc1cm1lm1dep-pvc/splunk-license-deploy-persistent.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: license-master
@@ -9,6 +9,11 @@ metadata:
     tier: management
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: splunk
+      role: splunk_license_master
+      tier: management
   template:
     metadata:
       labels:
diff --git a/test_scenarios/kubernetes/3idxc3shc1cm1lm1dep-pvc/splunk-master-deploy-persistent.yaml b/test_scenarios/kubernetes/3idxc3shc1cm1lm1dep-pvc/splunk-master-deploy-persistent.yaml
index 2f9266ec..a461da93 100644
--- a/test_scenarios/kubernetes/3idxc3shc1cm1lm1dep-pvc/splunk-master-deploy-persistent.yaml
+++ b/test_scenarios/kubernetes/3idxc3shc1cm1lm1dep-pvc/splunk-master-deploy-persistent.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: master
@@ -9,6 +9,11 @@ metadata:
     tier: management 
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: splunk
+      role: splunk_cluster_master
+      tier: management
   template:
     metadata:
       labels:
diff --git a/test_scenarios/kubernetes/3idxc3shc1cm1lm1dep-pvc/splunk-search-captain-deploy-persistent.yaml b/test_scenarios/kubernetes/3idxc3shc1cm1lm1dep-pvc/splunk-search-captain-deploy-persistent.yaml
index 3db38d68..46550c4b 100644
--- a/test_scenarios/kubernetes/3idxc3shc1cm1lm1dep-pvc/splunk-search-captain-deploy-persistent.yaml
+++ b/test_scenarios/kubernetes/3idxc3shc1cm1lm1dep-pvc/splunk-search-captain-deploy-persistent.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: captain
@@ -9,6 +9,11 @@ metadata:
     tier: search
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: splunk
+      role: splunk_search_head_captain
+      tier: search
   template:
     metadata:
       labels:
diff --git a/test_scenarios/kubernetes/3idxc3shc1cm1lm1dep/splunk-deployer-deploy-emptydir.yaml b/test_scenarios/kubernetes/3idxc3shc1cm1lm1dep/splunk-deployer-deploy-emptydir.yaml
index 4b01452f..2799fb67 100644
--- a/test_scenarios/kubernetes/3idxc3shc1cm1lm1dep/splunk-deployer-deploy-emptydir.yaml
+++ b/test_scenarios/kubernetes/3idxc3shc1cm1lm1dep/splunk-deployer-deploy-emptydir.yaml
@@ -1,10 +1,19 @@
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: deployer 
+  labels:
+    app: splunk
+    role: splunk_deployer
+    tier: management
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: splunk
+      role: splunk_deployer
+      tier: management
   template:
     metadata:
       labels:
diff --git a/test_scenarios/kubernetes/3idxc3shc1cm1lm1dep/splunk-license-deploy-emptydir.yaml b/test_scenarios/kubernetes/3idxc3shc1cm1lm1dep/splunk-license-deploy-emptydir.yaml
index ace02b18..fb37fc60 100644
--- a/test_scenarios/kubernetes/3idxc3shc1cm1lm1dep/splunk-license-deploy-emptydir.yaml
+++ b/test_scenarios/kubernetes/3idxc3shc1cm1lm1dep/splunk-license-deploy-emptydir.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: license-master
@@ -9,6 +9,11 @@ metadata:
     tier: management
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: splunk
+      role: splunk_license_master
+      tier: management
   template:
     metadata:
       labels:
diff --git a/test_scenarios/kubernetes/3idxc3shc1cm1lm1dep/splunk-master-deploy-emptydir.yaml b/test_scenarios/kubernetes/3idxc3shc1cm1lm1dep/splunk-master-deploy-emptydir.yaml
index 1b7dc277..4b43de05 100644
--- a/test_scenarios/kubernetes/3idxc3shc1cm1lm1dep/splunk-master-deploy-emptydir.yaml
+++ b/test_scenarios/kubernetes/3idxc3shc1cm1lm1dep/splunk-master-deploy-emptydir.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: master
@@ -9,6 +9,11 @@ metadata:
     tier: management 
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: splunk
+      role: splunk_cluster_master
+      tier: management
   template:
     metadata:
       labels:
diff --git a/test_scenarios/kubernetes/3idxc3shc1cm1lm1dep/splunk-search-captain-deploy-emptydir.yaml b/test_scenarios/kubernetes/3idxc3shc1cm1lm1dep/splunk-search-captain-deploy-emptydir.yaml
index 038fa385..8f69dcac 100644
--- a/test_scenarios/kubernetes/3idxc3shc1cm1lm1dep/splunk-search-captain-deploy-emptydir.yaml
+++ b/test_scenarios/kubernetes/3idxc3shc1cm1lm1dep/splunk-search-captain-deploy-emptydir.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: captain
@@ -9,6 +9,11 @@ metadata:
     tier: search
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: splunk
+      role: splunk_search_head_captain
+      tier: search
   template:
     metadata:
       labels: