diff --git a/charts/yourls/Chart.lock b/charts/yourls/Chart.lock
index bfed18d..e131cbe 100644
--- a/charts/yourls/Chart.lock
+++ b/charts/yourls/Chart.lock
@@ -1,9 +1,9 @@
 dependencies:
 - name: common
   repository: oci://registry-1.docker.io/bitnamicharts
-  version: 2.21.0
+  version: 2.22.0
 - name: mariadb
   repository: oci://registry-1.docker.io/bitnamicharts
   version: 19.0.3
-digest: sha256:58ed2f4920e2c9ba9ad1e712a617fe2dc3bceb1b77b16e5d4af253a5c2e41d90
-generated: "2024-08-05T20:23:38.613182737Z"
+digest: sha256:38cfcee2f8ddb6ce45b0b2e01bd3a19c5cb0f11ba8f63d718c8efac5ef2ec244
+generated: "2024-08-09T10:23:34.624063376Z"
diff --git a/charts/yourls/Chart.yaml b/charts/yourls/Chart.yaml
index 391b28a..bc22671 100644
--- a/charts/yourls/Chart.yaml
+++ b/charts/yourls/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-version: 5.14.7
+version: 5.14.8
 name: yourls
 description: Your Own URL Shortener
 appVersion: "1.9.2"
@@ -22,7 +22,7 @@ kubeVersion: ^1.23.0-0
 dependencies:
   - name: common
     repository: oci://registry-1.docker.io/bitnamicharts
-    version: ^2.21.0
+    version: ^2.22.0
     tags:
       - bitnami-common
   - name: mariadb
diff --git a/charts/yourls/templates/_helpers.tpl b/charts/yourls/templates/_helpers.tpl
index 97f1c37..5069318 100644
--- a/charts/yourls/templates/_helpers.tpl
+++ b/charts/yourls/templates/_helpers.tpl
@@ -12,12 +12,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 Return the proper YOURLS image name
 */}}
 {{- define "yourls.image" -}}
-{{- $imageRoot := .Values.image -}}
-{{- if not .Values.image.tag }}
-    {{- $tag := (dict "tag" .Chart.AppVersion) -}}
-    {{- $imageRoot := merge .Values.image $tag -}}
-{{- end -}}
-{{- include "common.images.image" (dict "imageRoot" $imageRoot "global" .Values.global) -}}
+{{- include "common.images.image" (dict "imageRoot" .Values.image "global" .Values.global "chart" .Chart) -}}
 {{- end -}}
 
 {{/*
@@ -31,7 +26,7 @@ Return the proper image name (for the metrics image)
 Return the proper image name (for the init container volume-permissions image)
 */}}
 {{- define "yourls.volumePermissions.image" -}}
-{{- include "common.images.image" ( dict "imageRoot" .Values.volumePermissions.image "global" .Values.global ) -}}
+{{- include "common.images.image" (dict "imageRoot" .Values.volumePermissions.image "global" .Values.global) -}}
 {{- end -}}
 
 {{/*