diff --git a/charts/stable/heimdall/Chart.yaml b/charts/stable/heimdall/Chart.yaml
index 6c6d6231..b59fa8ef 100644
--- a/charts/stable/heimdall/Chart.yaml
+++ b/charts/stable/heimdall/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 2.2.2
 description: An Application dashboard and launcher
 name: heimdall
-version: 6.4.0
+version: 7.0.0
 kubeVersion: ">=1.16.0-0"
 keywords:
 - heimdall
@@ -17,4 +17,4 @@ maintainers:
 dependencies:
 - name: common
   repository: https://library-charts.k8s-at-home.com
-  version: 2.5.0
+  version: 3.0.2
diff --git a/charts/stable/heimdall/README.md b/charts/stable/heimdall/README.md
index afa2463c..6d799599 100644
--- a/charts/stable/heimdall/README.md
+++ b/charts/stable/heimdall/README.md
@@ -1,6 +1,6 @@
 # heimdall
 
-![Version: 6.4.0](https://img.shields.io/badge/Version-6.4.0-informational?style=flat-square) ![AppVersion: 2.2.2](https://img.shields.io/badge/AppVersion-2.2.2-informational?style=flat-square)
+![Version: 7.0.0](https://img.shields.io/badge/Version-7.0.0-informational?style=flat-square) ![AppVersion: 2.2.2](https://img.shields.io/badge/AppVersion-2.2.2-informational?style=flat-square)
 
 An Application dashboard and launcher
 
@@ -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.0.2 |
 
 ## TL;DR
 
@@ -76,16 +76,16 @@ N/A
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| env | object | `{}` |  |
-| image.pullPolicy | string | `"IfNotPresent"` |  |
-| image.repository | string | `"linuxserver/heimdall"` |  |
-| image.tag | string | `"version-2.2.2"` |  |
-| ingress.enabled | bool | `false` |  |
-| persistence.config.emptyDir.enabled | bool | `false` |  |
-| persistence.config.enabled | bool | `false` |  |
-| probes.startup.enabled | bool | `true` |  |
-| service.port.port | int | `80` |  |
-| strategy.type | string | `"Recreate"` |  |
+| env | object | See below | environment variables. See more environment variables in the [heimdall documentation](https://github.com/linuxserver/docker-heimdall#parameters). |
+| env.PGID | string | `"1000"` | Set the container group id |
+| env.PUID | string | `"1000"` | Set the container user id |
+| env.TZ | string | `"UTC"` | Set the container timezone |
+| image.pullPolicy | string | `"IfNotPresent"` | image pull policy |
+| image.repository | string | `"linuxserver/heimdall"` | image repository |
+| image.tag | string | `"version-2.2.2"` | 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
 
@@ -93,21 +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).
 
-### [1.0.0]
-
-#### Added
-
-- N/A
+### [7.0.0]
 
 #### Changed
 
-- N/A
+- **BREAKING**: Upgraded the common library dependency to version 3.0.2. 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.2/charts/stable/common/) for the up-to-date values.
 
-#### Removed
-
-- N/A
-
-[1.0.0]: #1.0.0
+[7.0.0]: #700
 
 ## Support
 
diff --git a/charts/stable/heimdall/README_CHANGELOG.md.gotmpl b/charts/stable/heimdall/README_CHANGELOG.md.gotmpl
index 457def03..ae442568 100644
--- a/charts/stable/heimdall/README_CHANGELOG.md.gotmpl
+++ b/charts/stable/heimdall/README_CHANGELOG.md.gotmpl
@@ -9,19 +9,12 @@ 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).
 
-### [1.0.0]
-
-#### Added
-
-- N/A
+### [7.0.0]
 
 #### Changed
 
-- N/A
+- **BREAKING**: Upgraded the common library dependency to version 3.0.2. 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.2/charts/stable/common/) for the up-to-date values.
 
-#### Removed
-
-- N/A
-
-[1.0.0]: #1.0.0
+[7.0.0]: #700
 {{- end -}}
diff --git a/charts/stable/heimdall/values.yaml b/charts/stable/heimdall/values.yaml
index c7e72207..e4d604c7 100644
--- a/charts/stable/heimdall/values.yaml
+++ b/charts/stable/heimdall/values.yaml
@@ -6,31 +6,39 @@
 #
 
 image:
+  # -- image repository
   repository: linuxserver/heimdall
+  # -- image tag
   tag: version-2.2.2
+  # -- image pull policy
   pullPolicy: IfNotPresent
 
-strategy:
-  type: Recreate
-
-env: {}
-  # TZ:
-  # PUID:
-  # PGID:
+# -- environment variables. See more environment variables in the [heimdall documentation](https://github.com/linuxserver/docker-heimdall#parameters).
+# @default -- See below
+env:
+  # -- Set the container timezone
+  TZ: UTC
+  # -- Set the container user id
+  PUID: "1000"
+  # -- Set the container group id
+  PGID: "1000"
 
+# -- Configures service settings for the chart.
+# @default -- See values.yaml
 service:
-  port:
-    port: 80
+  main:
+    ports:
+      http:
+        port: 80
 
 ingress:
-  enabled: false
-
-probes:
-  startup:
-    enabled: true
+  # -- 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