diff --git a/mastodon/Chart.yaml b/mastodon/Chart.yaml
index 49e701a77db1b45829648bc8927de18fb503654b..eb6c614804e0f52051c4ead6efc2c1bf063d23af 100644
--- a/mastodon/Chart.yaml
+++ b/mastodon/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: mastodon
 description: Helm Chart for mastodon
 type: application
-version: 0.3.2
+version: 0.4.0
 appVersion: "v4.0"
diff --git a/mastodon/templates/deployment-streaming.yaml b/mastodon/templates/deployment-streaming.yaml
index f4d0541ef1ff37dacbf88921f563577d6832ab91..990d5f51099a40f1ead8763d6b35e70f15e8652d 100644
--- a/mastodon/templates/deployment-streaming.yaml
+++ b/mastodon/templates/deployment-streaming.yaml
@@ -48,6 +48,7 @@ spec:
               name: websocket
               protocol: TCP
           startupProbe:
+            failureThreshold: 15
             httpGet:
               port: websocket
               path: /api/v1/streaming/health
diff --git a/mastodon/templates/pod-tootctl.yaml b/mastodon/templates/pod-tootctl.yaml
deleted file mode 100644
index a8e7e533a2f3d14a978001640bc2f625aaf5b223..0000000000000000000000000000000000000000
--- a/mastodon/templates/pod-tootctl.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: {{ include "mastodon-helm.fullname" . }}-tootctl
-  labels:
-    component: tootctl
-    {{- include "mastodon-helm.labels" . | nindent 4 }}
-spec:
-  {{- with .Values.imagePullSecrets }}
-  imagePullSecrets:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-  securityContext:
-    {{- toYaml .Values.podSecurityContext | nindent 4 }}
-  volumes:
-    - name: data
-      {{- .Values.volumes.data | nindent 6 }}
-    - name: tmp
-      emptyDir:
-        medium: Memory
-  containers:
-    - name: {{ .Chart.Name }}
-      securityContext:
-        {{- toYaml .Values.securityContext | nindent 8 }}
-      image: "{{ .Values.web.repository }}:{{ .Values.web.tag | default .Chart.AppVersion }}"
-      imagePullPolicy: {{ .Values.web.pullPolicy }}
-      command:
-        - "/bin/sh"
-        - "-c"
-        - "while true; do sleep 60; done"
-      envFrom:
-        - secretRef:
-            name: {{ include "mastodon-helm.fullname" . }}
-      volumeMounts:
-        - mountPath: "/mastodon/public/system"
-          name: data
-        - mountPath: "/opt/mastodon/tmp"
-          name: tmp
-  {{- with .Values.nodeSelector }}
-  nodeSelector:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-  {{- with .Values.affinity }}
-  affinity:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-  {{- with .Values.tolerations }}
-  tolerations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
diff --git a/mastodon/templates/replicaset-tootctl.yaml b/mastodon/templates/replicaset-tootctl.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..f9544bf8dedf1c0f9de7853d41d62d1b926764fe
--- /dev/null
+++ b/mastodon/templates/replicaset-tootctl.yaml
@@ -0,0 +1,61 @@
+apiVersion: apps/v1
+kind: ReplicaSet
+metadata:
+  name: {{ include "mastodon-helm.fullname" . }}-tootctl
+  labels:
+    component: tootctl
+    {{- include "mastodon-helm.labels" . | nindent 4 }}
+spec:
+  selector:
+    matchLabels:
+      component: tootctl
+      {{- include "mastodon-helm.labels" . | nindent 6 }}
+  template:
+    metadata:
+      name: {{ include "mastodon-helm.fullname" . }}-tootctl
+      labels:
+        component: tootctl
+        {{- include "mastodon-helm.labels" . | nindent 8 }}
+    spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      securityContext:
+        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      volumes:
+        - name: data
+          {{- .Values.volumes.data | nindent 10 }}
+        - name: tmp
+          emptyDir:
+            medium: Memory
+      containers:
+        - name: {{ .Chart.Name }}
+          securityContext:
+            {{- toYaml .Values.securityContext | nindent 12 }}
+          image: "{{ .Values.web.repository }}:{{ .Values.web.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.web.pullPolicy }}
+          command:
+            - "/bin/sh"
+            - "-c"
+            - "while true; do sleep 60; done"
+          envFrom:
+            - secretRef:
+                name: {{ include "mastodon-helm.fullname" . }}
+          volumeMounts:
+            - mountPath: "/mastodon/public/system"
+              name: data
+            - mountPath: "/opt/mastodon/tmp"
+              name: tmp
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}