diff --git a/test_scenarios/kubernetes/3idx1sh1cm-pvc/splunk-indexer-statefulset-persistent.yaml b/test_scenarios/kubernetes/3idx1sh1cm-pvc/splunk-indexer-statefulset-persistent.yaml
index 4c8f2d8b..b73284aa 100644
--- a/test_scenarios/kubernetes/3idx1sh1cm-pvc/splunk-indexer-statefulset-persistent.yaml
+++ b/test_scenarios/kubernetes/3idx1sh1cm-pvc/splunk-indexer-statefulset-persistent.yaml
@@ -1,4 +1,4 @@
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: indexer
@@ -7,6 +7,11 @@ metadata:
     role: splunk_indexer
     tier: indexer
 spec:
+  selector:
+    matchLabels:
+      app: splunk
+      role: splunk_indexer
+      tier: indexer
   replicas: 3
   serviceName: indexer
   volumeClaimTemplates:
diff --git a/test_scenarios/kubernetes/3idx1sh1cm/splunk-indexer-statefulset-emptydir.yaml b/test_scenarios/kubernetes/3idx1sh1cm/splunk-indexer-statefulset-emptydir.yaml
index 13fb88e7..77a926e5 100644
--- a/test_scenarios/kubernetes/3idx1sh1cm/splunk-indexer-statefulset-emptydir.yaml
+++ b/test_scenarios/kubernetes/3idx1sh1cm/splunk-indexer-statefulset-emptydir.yaml
@@ -1,4 +1,4 @@
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: indexer
@@ -7,6 +7,11 @@ metadata:
     role: splunk_indexer
     tier: indexer
 spec:
+  selector:
+    matchLabels:
+      app: splunk
+      role: splunk_indexer
+      tier: indexer
   replicas: 3
   serviceName: indexer
   template:
diff --git a/test_scenarios/kubernetes/3idxc3shc1cm1lm1dep-pvc/splunk-indexer-statefulset-persistent.yaml b/test_scenarios/kubernetes/3idxc3shc1cm1lm1dep-pvc/splunk-indexer-statefulset-persistent.yaml
index 7707b836..2d1dbacc 100644
--- a/test_scenarios/kubernetes/3idxc3shc1cm1lm1dep-pvc/splunk-indexer-statefulset-persistent.yaml
+++ b/test_scenarios/kubernetes/3idxc3shc1cm1lm1dep-pvc/splunk-indexer-statefulset-persistent.yaml
@@ -1,4 +1,4 @@
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: indexer
@@ -7,6 +7,11 @@ metadata:
     role: splunk_indexer
     tier: indexer
 spec:
+  selector:
+    matchLabels:
+      app: splunk
+      role: splunk_indexer
+      tier: indexer
   replicas: 3
   serviceName: indexer
   volumeClaimTemplates:
diff --git a/test_scenarios/kubernetes/3idxc3shc1cm1lm1dep-pvc/splunk-search-statefulset-persistent.yaml b/test_scenarios/kubernetes/3idxc3shc1cm1lm1dep-pvc/splunk-search-statefulset-persistent.yaml
index 91f33bc5..67c9bdf9 100644
--- a/test_scenarios/kubernetes/3idxc3shc1cm1lm1dep-pvc/splunk-search-statefulset-persistent.yaml
+++ b/test_scenarios/kubernetes/3idxc3shc1cm1lm1dep-pvc/splunk-search-statefulset-persistent.yaml
@@ -1,8 +1,17 @@
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: search
+  labels:
+    app: splunk
+    role: splunk_search_head
+    tier: search
 spec:
+  selector:
+    matchLabels:
+      app: splunk
+      role: splunk_search_head
+      tier: search
   replicas: 2 
   serviceName: search
   volumeClaimTemplates:
diff --git a/test_scenarios/kubernetes/3idxc3shc1cm1lm1dep/splunk-indexer-statefulset-emptydir.yaml b/test_scenarios/kubernetes/3idxc3shc1cm1lm1dep/splunk-indexer-statefulset-emptydir.yaml
index 5345a8f0..cfbde191 100644
--- a/test_scenarios/kubernetes/3idxc3shc1cm1lm1dep/splunk-indexer-statefulset-emptydir.yaml
+++ b/test_scenarios/kubernetes/3idxc3shc1cm1lm1dep/splunk-indexer-statefulset-emptydir.yaml
@@ -1,4 +1,4 @@
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: indexer
@@ -7,6 +7,11 @@ metadata:
     role: splunk_indexer
     tier: indexer
 spec:
+  selector:
+    matchLabels:
+      app: splunk
+      role: splunk_indexer
+      tier: indexer
   replicas: 3
   serviceName: indexer
   template:
diff --git a/test_scenarios/kubernetes/3idxc3shc1cm1lm1dep/splunk-search-statefulset-emptydir.yaml b/test_scenarios/kubernetes/3idxc3shc1cm1lm1dep/splunk-search-statefulset-emptydir.yaml
index 877be282..8c65d878 100644
--- a/test_scenarios/kubernetes/3idxc3shc1cm1lm1dep/splunk-search-statefulset-emptydir.yaml
+++ b/test_scenarios/kubernetes/3idxc3shc1cm1lm1dep/splunk-search-statefulset-emptydir.yaml
@@ -1,4 +1,4 @@
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: search
@@ -7,6 +7,11 @@ metadata:
     role: splunk_search_head
     tier: search
 spec:
+  selector:
+    matchLabels:
+      app: splunk
+      role: splunk_search_head
+      tier: search
   replicas: 2 
   serviceName: search 
   template: