diff --git a/charts/stable/gonic/Chart.yaml b/charts/stable/gonic/Chart.yaml
index c7c599ed..5c9bb84d 100644
--- a/charts/stable/gonic/Chart.yaml
+++ b/charts/stable/gonic/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: v0.12.0
+appVersion: v0.13.1
 description: Music streaming server / subsonic server API implementation
 name: gonic
-version: 4.4.0
+version: 5.0.0
 kubeVersion: ">=1.16.0-0"
 keywords:
 - music
@@ -18,4 +18,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/gonic/README.md b/charts/stable/gonic/README.md
index d8819f6b..678eef11 100644
--- a/charts/stable/gonic/README.md
+++ b/charts/stable/gonic/README.md
@@ -1,6 +1,6 @@
 # gonic
 
-![Version: 4.4.0](https://img.shields.io/badge/Version-4.4.0-informational?style=flat-square) ![AppVersion: v0.12.0](https://img.shields.io/badge/AppVersion-v0.12.0-informational?style=flat-square)
+![Version: 5.0.0](https://img.shields.io/badge/Version-5.0.0-informational?style=flat-square) ![AppVersion: v0.13.1](https://img.shields.io/badge/AppVersion-v0.13.1-informational?style=flat-square)
 
 Music streaming server / subsonic server API implementation
 
@@ -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,22 +76,14 @@ N/A
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| env | object | `{}` |  |
-| image.pullPolicy | string | `"IfNotPresent"` |  |
-| image.repository | string | `"sentriz/gonic"` |  |
-| image.tag | string | `"v0.12.0"` |  |
-| ingress.enabled | bool | `false` |  |
-| persistence.cache.emptyDir.enabled | bool | `false` |  |
-| persistence.cache.enabled | bool | `false` |  |
-| persistence.data.emptyDir.enabled | bool | `false` |  |
-| persistence.data.enabled | bool | `false` |  |
-| persistence.music.emptyDir.enabled | bool | `false` |  |
-| persistence.music.enabled | bool | `false` |  |
-| persistence.music.mountPath | string | `"/music"` |  |
-| persistence.podcasts.emptyDir.enabled | bool | `false` |  |
-| persistence.podcasts.enabled | bool | `false` |  |
-| service.port.port | int | `80` |  |
-| strategy.type | string | `"Recreate"` |  |
+| env | object | See below | environment variables. See more environment variables in the [gonic documentation](https://github.com/sentriz/gonic#configuration-options) |
+| env.TZ | string | `"UTC"` | Set the container timezone |
+| image.pullPolicy | string | `"IfNotPresent"` | image pull policy |
+| image.repository | string | `"sentriz/gonic"` | image repository |
+| image.tag | string | `"v0.13.1"` | 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
 
@@ -99,21 +91,15 @@ 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
+### [5.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.
+- Changed image tag to `v0.13.1`.
 
-#### Removed
-
-- N/A
-
-[1.0.0]: #1.0.0
+[5.0.0]: #500
 
 ## Support
 
diff --git a/charts/stable/gonic/README_CHANGELOG.md.gotmpl b/charts/stable/gonic/README_CHANGELOG.md.gotmpl
index 457def03..f73764b1 100644
--- a/charts/stable/gonic/README_CHANGELOG.md.gotmpl
+++ b/charts/stable/gonic/README_CHANGELOG.md.gotmpl
@@ -9,19 +9,13 @@ 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
+### [5.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.
+- Changed image tag to `v0.13.1`.
 
-#### Removed
-
-- N/A
-
-[1.0.0]: #1.0.0
+[5.0.0]: #500
 {{- end -}}
diff --git a/charts/stable/gonic/ci/ct-values.yaml b/charts/stable/gonic/ci/ct-values.yaml
index 6be00d01..6d8d2f4a 100644
--- a/charts/stable/gonic/ci/ct-values.yaml
+++ b/charts/stable/gonic/ci/ct-values.yaml
@@ -5,21 +5,17 @@ env:
 persistence:
   data:
     enabled: true
-    emptyDir:
-      enabled: true
+    type: emptyDir
     mountPath: /data
   podcasts:
     enabled: true
-    emptyDir:
-      enabled: true
+    type: emptyDir
     mountPath: /podcasts
   cache:
     enabled: true
-    emptyDir:
-      enabled: true
+    type: emptyDir
     mountPath: /cache
   music:
     enabled: true
-    emptyDir:
-      enabled: true
+    type: emptyDir
     mountPath: /music
diff --git a/charts/stable/gonic/values.yaml b/charts/stable/gonic/values.yaml
index 4e39e133..a800d376 100644
--- a/charts/stable/gonic/values.yaml
+++ b/charts/stable/gonic/values.yaml
@@ -6,58 +6,44 @@
 #
 
 image:
+  # -- image repository
   repository: sentriz/gonic
+  # -- image pull policy
   pullPolicy: IfNotPresent
-  tag: v0.12.0
+  # -- image tag
+  tag: v0.13.1
 
-strategy:
-  type: Recreate
-
-# # See more environment variables in the gonic documentation
-# https://github.com/sentriz/gonic#configuration-options
-env: {}
-  # TZ:
+# -- environment variables. See more environment variables in the [gonic documentation](https://github.com/sentriz/gonic#configuration-options)
+# @default -- See below
+env:
+  # -- Set the container timezone
+  TZ: UTC
   # GONIC_MUSIC_PATH:
   # GONIC_PODCAST_PATH:
   # GONIC_CACHE_PATH:
 
+# -- Configures service settings for the chart.
+# @default -- See values.yaml
 service:
-  port:
-    port: 80
+  main:
+    ports:
+      http:
+        port: 80
 
 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:
   data:
     enabled: false
-    emptyDir:
-      enabled: false
-
   podcasts:
     enabled: false
-    emptyDir:
-      enabled: false
-
   cache:
     enabled: false
-    emptyDir:
-      enabled: false
-
   music:
     enabled: false
-    emptyDir:
-      enabled: false
-    mountPath: /music
-    ## Persistent Volume Storage Class
-    ## If defined, storageClassName: <storageClass>
-    ## If set to "-", storageClassName: "", which disables dynamic provisioning
-    ## If undefined (the default) or set to null, no storageClassName spec is
-    ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
-    ##   GKE, AWS & OpenStack)
-    # storageClass: "-"
-    # accessMode: ReadWriteOnce
-    # size: 1Gi
-    ## Do not delete the pvc upon helm uninstall
-    # skipuninstall: false
-    # existingClaim: ""