diff --git a/docker/set_cluster_nodes.sh b/docker/set_cluster_nodes.sh
index d59187e..7083ca7 100755
--- a/docker/set_cluster_nodes.sh
+++ b/docker/set_cluster_nodes.sh
@@ -5,7 +5,7 @@ set -u
 
 function join_by { local IFS="$1"; shift; echo "$*"; }
 
-STATEFUL_SETS=$(curl -f -k https://${KUBERNETES_SERVICE_HOST}/apis/apps/v1beta1/statefulsets -H "Authorization: Bearer $(cat /var/run/secrets/kubernetes.io/serviceaccount/token)")
+STATEFUL_SETS=$(curl -f -k https://${KUBERNETES_SERVICE_HOST}/apis/apps/v1/statefulsets -H "Authorization: Bearer $(cat /var/run/secrets/kubernetes.io/serviceaccount/token)")
 RMQ_SS=$(echo $STATEFUL_SETS | jq ".items[] | select(.metadata.name == \"${RABBITMQ_APP_NAME}\")")
 REPLICAS=$(echo $RMQ_SS | jq .spec.replicas)
 SERVICE_NAME=$(echo $RMQ_SS | jq .spec.serviceName | tr -d '"')
diff --git a/docker/set_ha.sh b/docker/set_ha.sh
index d043d12..99ab045 100755
--- a/docker/set_ha.sh
+++ b/docker/set_ha.sh
@@ -7,8 +7,8 @@ while true ; do
   if [ ${ready} == 0 ]; then
     echo "RabbitMQ is ready, setting ha policy"
     sleep 5
-    rabbitmqctl set_policy ha-all '.*' '{{RABBITMQ_HA_POLICY}}' --apply-to queues
-    rabbitmqctl set_policy expiry '.*' '{"expires":1800000}' --apply-to queues
+    rabbitmqctl set_policy ha-all '.*' '{{RABBITMQ_HA_POLICY}}' --apply-to queues || break
+    rabbitmqctl set_policy expiry '.*' '{"expires":1800000}' --apply-to queues || break
     echo "ha-all policy set successfully"
     break
   fi
diff --git a/kube/stateful.set.yml b/kube/stateful.set.yml
index 3403908..4564acb 100644
--- a/kube/stateful.set.yml
+++ b/kube/stateful.set.yml
@@ -1,10 +1,13 @@
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: {{APP_NAME}}
 spec:
   serviceName: {{SVC_NAME}}
   replicas: {{REPLICAS}}
+  selector:
+    matchLabels:
+      app: {{APP_NAME}}
   template:
     metadata:
       labels: