diff --git a/docs/index.yaml b/docs/index.yaml
index 40ee58a..2d827a7 100755
--- a/docs/index.yaml
+++ b/docs/index.yaml
@@ -61,6 +61,14 @@ entries:
     - https://everpeace.github.io/helm-charts/kafka-throttlable-perf-consumer-0.1.0.tgz
     version: 0.1.0
   localstack:
+  - apiVersion: v1
+    created: 2019-07-05T15:30:40.557836234+02:00
+    description: A Helm chart for localstack
+    digest: 0095d5b9af93417a5fbf480dc9a5f3e3e2af87212d5b38c248b5a7760a3b5dda
+    name: localstack
+    urls:
+    - https://everpeace.github.io/helm-charts/localstack-0.5.0.tgz
+    version: 0.5.0
   - apiVersion: v1
     created: 2019-06-18T11:47:35.27767+02:00
     description: A Helm chart for localstack
@@ -77,4 +85,4 @@ entries:
     urls:
     - https://everpeace.github.io/helm-charts/localstack-0.1.0.tgz
     version: 0.1.0
-generated: 2019-06-18T11:47:35.274468+02:00
+generated: 2019-07-05T15:30:40.554169517+02:00
diff --git a/docs/localstack-0.5.0.tgz b/docs/localstack-0.5.0.tgz
new file mode 100644
index 0000000..f599561
Binary files /dev/null and b/docs/localstack-0.5.0.tgz differ
diff --git a/localstack/Chart.yaml b/localstack/Chart.yaml
index 5bf13ed..3d89048 100644
--- a/localstack/Chart.yaml
+++ b/localstack/Chart.yaml
@@ -1,4 +1,4 @@
 apiVersion: v1
 description: A Helm chart for localstack
 name: localstack
-version: 0.4.0
+version: 0.5.0
diff --git a/localstack/templates/deployment.yaml b/localstack/templates/statefulset.yaml
similarity index 96%
rename from localstack/templates/deployment.yaml
rename to localstack/templates/statefulset.yaml
index 0cd1d4a..460d911 100644
--- a/localstack/templates/deployment.yaml
+++ b/localstack/templates/statefulset.yaml
@@ -1,5 +1,5 @@
-apiVersion: extensions/v1beta1
-kind: Deployment
+apiVersion: apps/v1
+kind: StatefulSet
 metadata:
   name: {{ template "fullname" . }}
   labels:
@@ -8,6 +8,10 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 spec:
+  selector:
+    matchLabels:
+      app: {{ template "name" . }}
+      release: {{ .Release.Name }}
   template:
     metadata:
       labels: