diff --git a/cluster/apps/data/bookstack/helm-release.yaml b/cluster/apps/data/bookstack/helm-release.yaml
index f5919808b..8d448e04c 100644
--- a/cluster/apps/data/bookstack/helm-release.yaml
+++ b/cluster/apps/data/bookstack/helm-release.yaml
@@ -10,10 +10,10 @@ spec:
     spec:
       # renovate: registryUrl=https://nicholaswilde.github.io/helm-charts/
       chart: bookstack
-      version: 0.1.16
+      version: 1.0.0
       sourceRef:
         kind: HelmRepository
-        name: nicholaswilde-charts
+        name: k8s-at-home-charts
         namespace: flux-system
       interval: 5m
   values:
@@ -21,10 +21,20 @@ spec:
       repository: ghcr.io/linuxserver/bookstack
       pullPolicy: IfNotPresent
       # Overrides the image tag whose default is the chart appVersion.
-      tag: "version-v21.04"
+      tag: "version-v21.04.2"
+    mariadb:
+      enabled: true
+      auth:
+        database: bookstack
+        username: bookstack
+        password: ${SECRET_BOOKSTACK_DB_PASSWORD}
+      primary:
+        persistence:
+          enabled: true
+          existingClaim: bookstack-db
     env:
       APP_URL: https://bookstack.${SECRET_CLUSTER_DOMAIN}/
-      DB_HOST: mariadb-kube.data.svc.cluster.local.
+      DB_HOST: bookstack-mariadb
       DB_DATABASE: bookstack
       DB_USERNAME: bookstack
       DB_PASSWORD: ${SECRET_BOOKSTACK_DB_PASSWORD}
@@ -38,7 +48,6 @@ spec:
       enabled: true
       annotations:
         kubernetes.io/ingress.class: "nginx"
-        nginx.ingress.kubernetes.io/whitelist-source-range: 0.0.0.0/0
       hosts:
         - host: bookstack.${SECRET_CLUSTER_DOMAIN}
           paths:
@@ -51,4 +60,4 @@ spec:
       config:
         enabled: true
         mountPath: /config
-        existingClaim: bookstack-config
+        existingClaim: bookstack-config
\ No newline at end of file
diff --git a/cluster/apps/data/bookstack/kustomization.yaml b/cluster/apps/data/bookstack/kustomization.yaml
index 21f1d9e05..a71d36f14 100644
--- a/cluster/apps/data/bookstack/kustomization.yaml
+++ b/cluster/apps/data/bookstack/kustomization.yaml
@@ -2,4 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - helm-release.yaml
-  - volume.yaml
+  - volumes.yaml
diff --git a/cluster/apps/data/bookstack/volume.yaml b/cluster/apps/data/bookstack/volume.yaml
index 4ab320ed1..a902e593a 100644
--- a/cluster/apps/data/bookstack/volume.yaml
+++ b/cluster/apps/data/bookstack/volume.yaml
@@ -12,4 +12,4 @@ spec:
   storageClassName: rook-ceph-block
   resources:
     requests:
-      storage: 1Gi
+      storage: 5Gi
diff --git a/cluster/apps/data/bookstack/volumes.yaml b/cluster/apps/data/bookstack/volumes.yaml
new file mode 100644
index 000000000..f92231dcf
--- /dev/null
+++ b/cluster/apps/data/bookstack/volumes.yaml
@@ -0,0 +1,30 @@
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: bookstack-config
+  namespace: data
+  labels:
+    kasten-io-snapshots: "enable"
+spec:
+  accessModes:
+    - ReadWriteOnce
+  storageClassName: rook-ceph-block
+  resources:
+    requests:
+      storage: 5Gi
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: bookstack-db
+  namespace: data
+  labels:
+    kasten-io-snapshots: "enable"
+spec:
+  accessModes:
+    - ReadWriteOnce
+  storageClassName: rook-ceph-block
+  resources:
+    requests:
+      storage: 5Gi
diff --git a/cluster/base-custom/charts/kustomization.yaml b/cluster/base-custom/charts/kustomization.yaml
index f7a93820f..e7c250984 100644
--- a/cluster/base-custom/charts/kustomization.yaml
+++ b/cluster/base-custom/charts/kustomization.yaml
@@ -19,7 +19,6 @@ resources:
   - kasten-charts.yaml
   - kubernetes-dashboard-charts.yaml
   - kubernetes-sigs-descheduler-charts.yaml
-  - nicholaswilde.yaml
   - node-feature-discovery.yaml
   - prometheus-community-charts.yaml
   - rook-ceph-charts.yaml
diff --git a/cluster/base-custom/charts/nicholaswilde.yaml b/cluster/base-custom/charts/nicholaswilde.yaml
deleted file mode 100644
index 3ccaf0c20..000000000
--- a/cluster/base-custom/charts/nicholaswilde.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-apiVersion: source.toolkit.fluxcd.io/v1beta1
-kind: HelmRepository
-metadata:
-  name: nicholaswilde-charts
-  namespace: flux-system
-spec:
-  interval: 10m
-  url: https://nicholaswilde.github.io/helm-charts
-  timeout: 3m