diff --git a/charts/stable/calibre/Chart.yaml b/charts/stable/calibre/Chart.yaml
index ff314681..e81e80dc 100644
--- a/charts/stable/calibre/Chart.yaml
+++ b/charts/stable/calibre/Chart.yaml
@@ -1,10 +1,10 @@
 ---
 
 apiVersion: v2
-appVersion: 5.14.0
+appVersion: version-v5.21.0
 description: Calibre is a powerful and easy to use e-book manager.
 name: calibre
-version: 3.3.0
+version: 4.0.0
 kubeVersion: ">=1.16.0-0"
 keywords:
   - calibre
@@ -19,4 +19,4 @@ maintainers:
 dependencies:
   - name: common
     repository: https://library-charts.k8s-at-home.com
-    version: 2.5.0
+    version: 3.1.1
diff --git a/charts/stable/calibre/README.md b/charts/stable/calibre/README.md
index 4043b51d..d98725c4 100644
--- a/charts/stable/calibre/README.md
+++ b/charts/stable/calibre/README.md
@@ -1,6 +1,6 @@
 # calibre
 
-![Version: 3.3.0](https://img.shields.io/badge/Version-3.3.0-informational?style=flat-square) ![AppVersion: 5.14.0](https://img.shields.io/badge/AppVersion-5.14.0-informational?style=flat-square)
+![Version: 4.0.0](https://img.shields.io/badge/Version-4.0.0-informational?style=flat-square) ![AppVersion: version-v5.21.0](https://img.shields.io/badge/AppVersion-version--v5.21.0-informational?style=flat-square)
 
 Calibre is a powerful and easy to use e-book manager.
 
@@ -19,7 +19,7 @@ Kubernetes: `>=1.16.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
-| https://library-charts.k8s-at-home.com | common | 2.5.0 |
+| https://library-charts.k8s-at-home.com | common | 3.1.1 |
 
 ## TL;DR
 
@@ -76,28 +76,20 @@ N/A
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
+| env | object | See below | environment variables. See [image docs](https://docs.linuxserver.io/images/docker-calibre#environment-variables-e) for more details. |
 | env.CLI_ARGS | string | `nil` | Optionally pass cli start arguments to calibre. |
 | env.GUAC_PASS | string | `nil` | Password's md5 hash for the calibre gui |
 | env.GUAC_USER | string | `nil` | Username for the calibre gui |
-| env.PGID | string | `"1000"` | for GroupID |
-| env.PUID | string | `"1000"` | for UserID |
-| env.TZ | string | `nil` | Set the time zone, e.g. Europe/Amsterdam |
+| env.PGID | string | `"1001"` | Specify the group ID the application will run as |
+| env.PUID | string | `"1001"` | Specify the user ID the application will run as |
+| env.TZ | string | `"UTC"` | Set the container timezone |
 | env.UMASK_SET | string | `"022"` | for umask setting of Calibre, default if left unset is 022. |
-| image.pullPolicy | string | `"IfNotPresent"` |  |
-| image.repository | string | `"linuxserver/calibre"` |  |
-| image.tag | string | `"version-v5.14.0"` |  |
-| ingress.enabled | bool | `false` |  |
-| persistence.config.emptyDir.enabled | bool | `false` |  |
-| persistence.config.enabled | bool | `false` |  |
-| service.additionalServices[0].enabled | bool | `false` |  |
-| service.additionalServices[0].nameSuffix | string | `"webserver"` |  |
-| service.additionalServices[0].port.name | string | `"webserver"` |  |
-| service.additionalServices[0].port.port | int | `8081` |  |
-| service.additionalServices[0].port.protocol | string | `"TCP"` |  |
-| service.additionalServices[0].port.targetPort | int | `8081` |  |
-| service.additionalServices[0].type | string | `"ClusterIP"` |  |
-| service.port | object | `{"name":"gui","port":8080}` | The default port is 8080 |
-| strategy.type | string | `"Recreate"` |  |
+| image.pullPolicy | string | `"IfNotPresent"` | image pull policy |
+| image.repository | string | `"linuxserver/calibre"` | image repository |
+| image.tag | string | `"version-v5.21.0"` | image tag |
+| ingress.main | object | See values.yaml | Enable and configure ingress settings for the chart under this key. |
+| 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
 
@@ -105,6 +97,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).
 
+### [4.0.0]
+
+#### Changed
+
+- **BREAKING**: Upgraded the common library dependency to version 3.1.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.1.1/charts/stable/common/) for the up-to-date values.
+- Changed image tag to `version-v5.21.0`.
+
 ### [3.1.1]
 
 #### Fixed
diff --git a/charts/stable/calibre/README_CHANGELOG.md.gotmpl b/charts/stable/calibre/README_CHANGELOG.md.gotmpl
index fcb6dc04..5a68e74c 100644
--- a/charts/stable/calibre/README_CHANGELOG.md.gotmpl
+++ b/charts/stable/calibre/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).
 
+### [4.0.0]
+
+#### Changed
+
+- **BREAKING**: Upgraded the common library dependency to version 3.1.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.1.1/charts/stable/common/) for the up-to-date values.
+- Changed image tag to `version-v5.21.0`.
+
 ### [3.1.1]
 
 #### Fixed
diff --git a/charts/stable/calibre/values.yaml b/charts/stable/calibre/values.yaml
index b3a80b10..94fc0a8e 100644
--- a/charts/stable/calibre/values.yaml
+++ b/charts/stable/calibre/values.yaml
@@ -9,20 +9,22 @@
 
 # -- This is the default, you can also use requarks/wiki
 image:
+  # -- image repository
   repository: linuxserver/calibre
+  # -- image tag
+  tag: version-v5.21.0
+  # -- image pull policy
   pullPolicy: IfNotPresent
-  tag: version-v5.14.0
-
-strategy:
-  type: Recreate
 
+# -- environment variables. See [image docs](https://docs.linuxserver.io/images/docker-calibre#environment-variables-e) for more details.
+# @default -- See below
 env:
-  # -- Set the time zone, e.g. Europe/Amsterdam
-  TZ:
-  # -- for UserID
-  PUID: "1000"
-  # -- for GroupID
-  PGID: "1000"
+  # -- Set the container timezone
+  TZ: UTC
+  # -- Specify the user ID the application will run as
+  PUID: "1001"
+  # -- Specify the group ID the application will run as
+  PGID: "1001"
   # -- Username for the calibre gui
   GUAC_USER:
   # -- Password's md5 hash for the calibre gui
@@ -32,26 +34,31 @@ env:
   # -- Optionally pass cli start arguments to calibre.
   CLI_ARGS:
 
+# -- Configures service settings for the chart.
+# @default -- See values.yaml
 service:
-  # -- The default port is 8080
-  port:
-    port: 8080
-    name: gui
-  additionalServices:
-  - enabled: false
-    nameSuffix: webserver
+  main:
+    ports:
+      http:
+        port: 8080
+  webserver:
+    enabled: false
     type: ClusterIP
-    port:
-      port: 8081
-      name: webserver
-      protocol: TCP
-      targetPort: 8081
+    ports:
+      webserver:
+        enabled: true
+        port: 8081
+        protocol: TCP
+        targetPort: 8081
 
 ingress:
-  enabled: false
+  # -- Enable and configure ingress settings for the chart under this key.
+  # @default -- See values.yaml
+  main:
+    enabled: false
 
+# -- Configure persistence settings for the chart under this key.
+# @default -- See values.yaml
 persistence:
   config:
     enabled: false
-    emptyDir:
-      enabled: false