diff --git a/charts/stable/bookstack/Chart.yaml b/charts/stable/bookstack/Chart.yaml
index ad325c16..c75af0f8 100644
--- a/charts/stable/bookstack/Chart.yaml
+++ b/charts/stable/bookstack/Chart.yaml
@@ -1,9 +1,9 @@
 ---
 apiVersion: v2
-appVersion: v21.04.2
+appVersion: v21.05.1
 description: A simple, self-hosted, easy-to-use platform for organising and storing information.
 name: bookstack
-version: 1.1.1
+version: 2.0.0
 kubeVersion: ">=1.16.0-0"
 keywords:
   - bookstack
@@ -23,7 +23,7 @@ maintainers:
 dependencies:
   - name: common
     repository: https://library-charts.k8s-at-home.com
-    version: 2.5.0
+    version: 3.0.1
   - name: mariadb
     version: 9.3.13
     repository: https://charts.bitnami.com/bitnami
diff --git a/charts/stable/bookstack/README.md b/charts/stable/bookstack/README.md
index d0ce456b..8469ada6 100644
--- a/charts/stable/bookstack/README.md
+++ b/charts/stable/bookstack/README.md
@@ -1,6 +1,6 @@
 # bookstack
 
-![Version: 1.1.1](https://img.shields.io/badge/Version-1.1.1-informational?style=flat-square) ![AppVersion: v21.04.2](https://img.shields.io/badge/AppVersion-v21.04.2-informational?style=flat-square)
+![Version: 2.0.0](https://img.shields.io/badge/Version-2.0.0-informational?style=flat-square) ![AppVersion: v21.05.1](https://img.shields.io/badge/AppVersion-v21.05.1-informational?style=flat-square)
 
 A simple, self-hosted, easy-to-use platform for organising and storing information.
 
@@ -20,7 +20,7 @@ Kubernetes: `>=1.16.0-0`
 | Repository | Name | Version |
 |------------|------|---------|
 | https://charts.bitnami.com/bitnami | mariadb | 9.3.13 |
-| https://library-charts.k8s-at-home.com | common | 2.5.0 |
+| https://library-charts.k8s-at-home.com | common | 3.0.1 |
 
 ## TL;DR
 
@@ -77,22 +77,15 @@ N/A
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| env | object | `{}` |  |
-| image.pullPolicy | string | `"IfNotPresent"` |  |
-| image.repository | string | `"ghcr.io/linuxserver/bookstack"` |  |
-| image.tag | string | `"version-v21.04.2"` |  |
-| ingress.enabled | bool | `false` |  |
-| mariadb.architecture | string | `"standalone"` |  |
-| mariadb.auth.database | string | `"bookstack"` |  |
-| mariadb.auth.password | string | `"bookstack"` |  |
-| mariadb.auth.username | string | `"bookstack"` |  |
-| mariadb.enabled | bool | `false` |  |
-| mariadb.primary.persistence.enabled | bool | `false` |  |
-| persistence.config.emptyDir.enabled | bool | `false` |  |
-| persistence.config.enabled | bool | `false` |  |
-| persistence.config.mountPath | string | `"/config"` |  |
-| service.port.port | int | `80` |  |
-| strategy.type | string | `"Recreate"` |  |
+| env | object | See below | environment variables. See more environment variables in the [bookstack documentation](https://hub.docker.com/r/linuxserver/bookstack) |
+| env.TZ | string | `"UTC"` | Set the container timezone |
+| image.pullPolicy | string | `"IfNotPresent"` | image tag |
+| image.repository | string | `"ghcr.io/linuxserver/bookstack"` | image repository |
+| image.tag | string | `"version-v21.05.1"` | image pull policy |
+| ingress.main | object | See values.yaml | Enable and configure ingress settings for the chart under this key. |
+| mariadb | object | See values.yaml | Enable and configure mariadb database subchart under this key.    For more options see [mariadb chart documentation](https://github.com/bitnami/charts/tree/master/bitnami/mariadb). |
+| persistence | object | See values.yaml | Configure persistence settings for the chart under this key. |
+| service | object | See values.yaml | Configures service settings for the chart. |
 
 ## Changelog
 
@@ -100,6 +93,14 @@ All notable changes to this application Helm chart will be documented in this fi
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+### [2.0.0]
+
+#### Changed
+
+- **BREAKING**: Upgraded the common library dependency to version 3.0.1. This introduces several breaking changes (`service`, `ingress` and `persistence` keys have been refactored).
+  Be sure to check out the [library chart](https://github.com/k8s-at-home/library-charts/blob/common-3.0.0/charts/stable/common/) for the up-to-date values.
+- Changed image tag to `version-v21.05.1`.
+
 ### [1.0.0]
 
 #### Added
@@ -114,7 +115,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - N/A
 
-[1.0.0]: #1.0.0
+[2.0.0]: #200
+[1.0.0]: #100
 
 ## Support
 
diff --git a/charts/stable/bookstack/README_CHANGELOG.md.gotmpl b/charts/stable/bookstack/README_CHANGELOG.md.gotmpl
index 99c5085f..8838da80 100644
--- a/charts/stable/bookstack/README_CHANGELOG.md.gotmpl
+++ b/charts/stable/bookstack/README_CHANGELOG.md.gotmpl
@@ -9,6 +9,14 @@ All notable changes to this application Helm chart will be documented in this fi
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+### [2.0.0]
+
+#### Changed
+
+- **BREAKING**: Upgraded the common library dependency to version 3.0.1. This introduces several breaking changes (`service`, `ingress` and `persistence` keys have been refactored).
+  Be sure to check out the [library chart](https://github.com/k8s-at-home/library-charts/blob/common-3.0.0/charts/stable/common/) for the up-to-date values.
+- Changed image tag to `version-v21.05.1`.
+
 ### [1.0.0]
 
 #### Added
@@ -23,5 +31,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - N/A
 
-[1.0.0]: #1.0.0
+[2.0.0]: #200
+[1.0.0]: #100
 {{- end -}}
diff --git a/charts/stable/bookstack/values.yaml b/charts/stable/bookstack/values.yaml
index fe48a734..6272866e 100644
--- a/charts/stable/bookstack/values.yaml
+++ b/charts/stable/bookstack/values.yaml
@@ -6,38 +6,47 @@
 #
 
 image:
+  # -- image repository
   repository: ghcr.io/linuxserver/bookstack
+  # -- image tag
   pullPolicy: IfNotPresent
-  tag: version-v21.04.2
+  # -- image pull policy
+  tag: version-v21.05.1
 
-strategy:
-  type: Recreate
-
-# See more environment variables in the bookstack documentation
-# https://hub.docker.com/r/linuxserver/bookstack
-env: {}
-  # TZ:
+# -- environment variables. See more environment variables in the [bookstack documentation](https://hub.docker.com/r/linuxserver/bookstack)
+# @default -- See below
+env:
+  # -- Set the container timezone
+  TZ: UTC
   # DB_HOST:
   # DB_USER:
   # DB_PASS:
   # DB_DATABASE:
 
+# -- Configures service settings for the chart.
+# @default -- See values.yaml
 service:
-  port:
-    port: 80
+  main:
+    ports:
+      http:
+        port: 80
 
 ingress:
-  enabled: false
-
-persistence:
-  config:
+  # -- Enable and configure ingress settings for the chart under this key.
+  # @default -- See values.yaml
+  main:
     enabled: false
-    emptyDir:
-      enabled: false
-    mountPath: /config
 
-# Enabled mariadb
-# ... for more options see https://github.com/bitnami/charts/tree/master/bitnami/mariadb
+# -- Configure persistence settings for the chart under this key.
+# @default -- See values.yaml
+persistence: {}
+  # config:
+  #   enabled: false
+  #   mountPath: /config
+
+# -- Enable and configure mariadb database subchart under this key.
+#    For more options see [mariadb chart documentation](https://github.com/bitnami/charts/tree/master/bitnami/mariadb).
+# @default -- See values.yaml
 mariadb:
   enabled: false
   architecture: standalone