diff --git a/kubernetes/apps/default/babybuddy/app/helmrelease.yaml b/kubernetes/apps/default/babybuddy/app/helmrelease.yaml
index fabe6a55c..42dba21c8 100644
--- a/kubernetes/apps/default/babybuddy/app/helmrelease.yaml
+++ b/kubernetes/apps/default/babybuddy/app/helmrelease.yaml
@@ -10,7 +10,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 1.5.1
+      version: 2.0.3
       sourceRef:
         kind: HelmRepository
         name: bjw-s
@@ -27,65 +27,82 @@ spec:
   uninstall:
     keepHistory: false
   values:
-    initContainers:
-      01-init-db:
-        image: ghcr.io/auricom/postgres-init:15.4@sha256:83e1abf06be5741bdfb8cb53fc03a1ade6e6b5ec7b92a8aac0c69ba5dc7e51f0
-        imagePullPolicy: IfNotPresent
-        envFrom: &envFrom
-          - secretRef:
-              name: babybuddy-secret
-      02-migrations:
-        image: ghcr.io/auricom/babybuddy:2.1.2@sha256:f13bcdc435aa51807e6642a8c22563b49bed9c228d809c751881cfe6ef72632d
-        imagePullPolicy: IfNotPresent
-        envFrom: *envFrom
-        command:
-          - "/bin/bash"
-          - "-c"
-          - |
-            #!/bin/bash
+    controllers:
+      main:
+        annotations:
+          reloader.stakater.com/auto: "true"
+        type: statefulset
+        initContainers:
+          01-init-db:
+            image:
+              repository: ghcr.io/auricom/postgres-init
+              tag: 15.4@sha256:83e1abf06be5741bdfb8cb53fc03a1ade6e6b5ec7b92a8aac0c69ba5dc7e51f0
+              pullPolicy: IfNotPresent
+            envFrom: &envFrom
+              - secretRef:
+                  name: babybuddy-secret
+          02-migrations:
+            image:
+              repository: ghcr.io/auricom/babybuddy
+              tag: 2.1.2@sha256:f13bcdc435aa51807e6642a8c22563b49bed9c228d809c751881cfe6ef72632d
+              pullPolicy: IfNotPresent
+            envFrom: *envFrom
+            command:
+              - "/bin/bash"
+              - "-c"
+              - |
+                #!/bin/bash
 
-            set -o errexit
-            set -o nounset
+                set -o errexit
+                set -o nounset
 
-            cd www/public
-            python3 ./manage.py migrate --noinput
-            python3 ./manage.py createcachetable
-    controller:
-      annotations:
-        reloader.stakater.com/auto: "true"
-    image:
-      repository: ghcr.io/auricom/babybuddy
-      tag: 2.1.2@sha256:f13bcdc435aa51807e6642a8c22563b49bed9c228d809c751881cfe6ef72632d
+                cd www/public
+                python3 ./manage.py migrate --noinput
+                python3 ./manage.py createcachetable
+        containers:
+          main:
+            image:
+              repository: ghcr.io/auricom/babybuddy
+              tag: 2.1.2@sha256:f13bcdc435aa51807e6642a8c22563b49bed9c228d809c751881cfe6ef72632d
+            env:
+              TZ: ${TIMEZONE}
+              EMAIL_HOST: smtp-relay.default.svc.cluster.local.
+              EMAIL_PORT: "2525"
+              EMAIL_USE_TLS: "false"
+            envFrom: *envFrom
+            resources:
+              requests:
+                cpu: 100m
+                memory: 256Mi
+        statefulset:
+          volumeClaimTemplates:
+            - name: config
+              accessMode: ReadWriteOnce
+              size: 1Gi
+              storageClass: rook-ceph-block
+              globalMounts:
+                - path: /config
     service:
       main:
         ports:
           http:
             port: 3000
-    env:
-      TZ: ${TIMEZONE}
-      EMAIL_HOST: smtp-relay.default.svc.cluster.local.
-      EMAIL_PORT: "2525"
-      EMAIL_USE_TLS: "false"
-    envFrom: *envFrom
-    persistence:
-      config:
+    serviceMonitor:
+      main:
         enabled: true
-        existingClaim: babybuddy-config
     ingress:
       main:
         enabled: true
-        ingressClassName: "nginx"
+        className: "nginx"
         annotations:
           hajimari.io/icon: mdi:baby-face-outline
         hosts:
-          - host: &host "babybuddy.${SECRET_CLUSTER_DOMAIN}"
+          - host: &host "{{ .Release.Name }}.${SECRET_CLUSTER_DOMAIN}"
             paths:
               - path: /
                 pathType: Prefix
+                service:
+                  name: main
         tls:
           - hosts:
               - *host
-    resources:
-      requests:
-        cpu: 100m
-        memory: 256Mi
diff --git a/kubernetes/apps/default/babybuddy/app/kustomization.yaml b/kubernetes/apps/default/babybuddy/app/kustomization.yaml
index 370332bbf..c254171ab 100644
--- a/kubernetes/apps/default/babybuddy/app/kustomization.yaml
+++ b/kubernetes/apps/default/babybuddy/app/kustomization.yaml
@@ -7,5 +7,4 @@ resources:
   - ./externalsecret.yaml
   - ./gatus.yaml
   - ./helmrelease.yaml
-  - ./volume.yaml
   - ./volsync.yaml
diff --git a/kubernetes/apps/default/babybuddy/app/volsync.yaml b/kubernetes/apps/default/babybuddy/app/volsync.yaml
index 5a7e0f221..f696c5f38 100644
--- a/kubernetes/apps/default/babybuddy/app/volsync.yaml
+++ b/kubernetes/apps/default/babybuddy/app/volsync.yaml
@@ -30,7 +30,7 @@ metadata:
   name: babybuddy
   namespace: default
 spec:
-  sourcePVC: babybuddy-config
+  sourcePVC: config-babybuddy-0
   trigger:
     schedule: "0 7 * * *"
   restic:
diff --git a/kubernetes/apps/default/babybuddy/app/volume.yaml b/kubernetes/apps/default/babybuddy/app/volume.yaml
deleted file mode 100644
index 35a6134dc..000000000
--- a/kubernetes/apps/default/babybuddy/app/volume.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: babybuddy-config
-  namespace: default
-  labels:
-    app.kubernetes.io/name: &name babybuddy
-    app.kubernetes.io/instance: *name
-    snapshot.home.arpa/enabled: "true"
-spec:
-  accessModes:
-    - ReadWriteOnce
-  storageClassName: rook-ceph-block
-  resources:
-    requests:
-      storage: 1Gi