diff --git a/cluster/data/_volumes.yaml b/cluster/data/_volumes.yaml
index 9472a3bd7..36a0d8e7b 100644
--- a/cluster/data/_volumes.yaml
+++ b/cluster/data/_volumes.yaml
@@ -63,3 +63,16 @@ spec:
   resources:
     requests:
       storage: 1Gi
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: bookstack-config
+  namespace: data
+spec:
+  accessModes:
+    - ReadWriteOnce
+  storageClassName: longhorn-backups
+  resources:
+    requests:
+      storage: 1Gi
diff --git a/cluster/data/bookstack.yaml b/cluster/data/bookstack.yaml
new file mode 100644
index 000000000..caa2495be
--- /dev/null
+++ b/cluster/data/bookstack.yaml
@@ -0,0 +1,43 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
+kind: HelmRelease
+metadata:
+  name: bookstack
+  namespace: data
+spec:
+  interval: 5m
+  chart:
+    spec:
+      # renovate: registryUrl=https://nicholaswilde.github.io/helm-charts/
+      chart: bookstack
+      version: 0.1.16
+      sourceRef:
+        kind: HelmRepository
+        name: nicholaswilde-charts
+        namespace: flux-system
+      interval: 5m
+  values:
+    image:
+      repository: ghcr.io/linuxserver/bookstack
+      pullPolicy: IfNotPresent
+      # Overrides the image tag whose default is the chart appVersion.
+      tag: "v0.31.8-ls126"
+    service:
+      port:
+        port: 80
+        annotations:
+          prometheus.io/probe: "true"
+          prometheus.io/protocol: http
+    ingress:
+      enabled: true
+      annotations:
+        kubernetes.io/ingress.class: "nginx"
+        nginx.ingress.kubernetes.io/whitelist-source-range: 0.0.0.0/0
+    persistence:
+      config:
+        enabled: true
+        mountPath: /config
+        existingClaim: bookstack-config
+  valuesFrom:
+  - kind: ConfigMap
+    name: helmrelease-data-bookstack
diff --git a/secrets/helmrelease-data-bookstack.yaml b/secrets/helmrelease-data-bookstack.yaml
new file mode 100644
index 000000000..4e0ecad4b
--- /dev/null
+++ b/secrets/helmrelease-data-bookstack.yaml
@@ -0,0 +1,36 @@
+apiVersion: v1
+data:
+    values.yaml: ENC[AES256_GCM,data:VrXNgzjTOgWXK9ncvpOklmq7X1MvdVSPqJYN6ieJLx9bUNzK9IPzMXgab51JVqzVqLpMlls8QqHnLO+Cd+7X5ZtytZFD+YAjBnL3ADzfW3Ca37bHB/K5g9uyIrf0aHOOWNwT4kSVUEuBr9XT8hJsh5Nturcuvl9qmQeniitLJlqMHdRI0rQjRYvwjYGwcEjPK04xPLjBX3U38NKuRGE0Bdj7AbDAQ/oFSW7SJ0SHgk5fVt8kUNo0FNEL9ed6doQBwtom3pKslUMukBW909WylqIJW7DAzp5/XXt2KEAGcu68zYpslzWywlrnDgIf7uPofX6XGaZxDTPQ1G3oVI9mdnbaibtP7FLBWBNl4G2PO+/bche3CFsF4hvn7e60AlU4KbjRdwQa4RHy1pPt9v4jV2Z3F/G6UfHOgIXMrBnA,iv:/sl12OZuH28ZgNneCOkRRDaXrhXTe7B7/iHAXRpq2MI=,tag:s/sFa7tdauC9OlJ3y7A01g==,type:str]
+kind: ConfigMap
+metadata:
+    creationTimestamp: null
+    name: helmrelease-data-bookstack
+    namespace: data
+sops:
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
+    lastmodified: '2021-03-16T01:17:19Z'
+    mac: ENC[AES256_GCM,data:MzuuVxqV7oAeqyl06HhWO2r9fEgYbcIISBKo3t/icz2z1QCdq+BdDENEJJgjGxoRIYKQB4QxuL36Uv7yQIYATdBkhkEvECeS7HiyjudxhWXQhwXIqMc7gvBSBYyAgSJWM8Ki/9uJWBHXkJtXLgtjowwxXrHkFPcxspvmF8h5QQs=,iv:guYcRlHIIX1CDU5BL5xKrwJJjDDGIeqXZ3UgIJSWmHE=,tag:P+5zdp7XZyOHqoHrLVjUqA==,type:str]
+    pgp:
+    -   created_at: '2021-03-16T01:17:18Z'
+        enc: |
+            -----BEGIN PGP MESSAGE-----
+
+            hQGMA/JorPHm1g9XAQwAh1ZmezfAZ5hCP+LELp+cev/cnmfIf+6pQsvMDgfdpSbk
+            2qkI7a9oDo0GrB7DDm5ZCMEHFkM84sP6Gg5YQzuoj4/m3EOg9pxkOhGHqSSqH6/u
+            j8YzzgQ1jMeVBNOIuUAebq6xyZkfr3jo6Kj7zU3FqpjovyxhgDuiy7AQLVrRG2qw
+            kreZekkbDeRYTCbu28ODxjaqmLLCQCzQkGsjtsKVxTlzgktjZM00hGIQzC8MX8GG
+            hvF8N6+sZaMTd1QsQ2Rvw4J4nhNQB+8gRXDzgy4HXXZ1hArxwx76FiZOdrrPgcXy
+            rkkyTIHr2lBJSccsmQuN2j8u+qYJgdO40JgUXEABX+yhf3oVZwyIA4K+EGMm/DJU
+            5itRzn3ykOS5QXUFAggUFSl1CMwGP7kZH0HEUpWXvcwmBg/LXhYrjjvsKlLY3ZLF
+            Qd1yG5qgMhrHdYhUgNtqm2jfFULNZbcCQq0xaP3FXKmZ9sSmwb1OeTPgKiFoSi4j
+            VGr1Szqq0vjywd0pqBti0l4Bu+HIo23Jnw9H7uYE+rhTez1tueGJLiOvmTpZ33vp
+            gFuZ7/eXMBHdxQrXzWHR2EjzYLI7wZMlW3FtGCy1byr8S4nGUD17lhNZBK7BMBRd
+            xu1XMkNJS2CgaHJ7MF5G
+            =yrqp
+            -----END PGP MESSAGE-----
+        fp: C8F8A49D04A1AB639F8EA21CDBA4B1DCB1FA5BDD
+    encrypted_regex: ^(data|stringData)$
+    version: 3.6.1