diff --git a/charts/stable/nextcloud/Chart.yaml b/charts/stable/nextcloud/Chart.yaml
index 601346a7d5a..3ec39ab517e 100644
--- a/charts/stable/nextcloud/Chart.yaml
+++ b/charts/stable/nextcloud/Chart.yaml
@@ -33,4 +33,4 @@ sources:
 - https://github.com/nextcloud/docker
 - https://github.com/nextcloud/helm
 type: application
-version: 4.0.4
+version: 4.0.5
diff --git a/charts/stable/postgresql/Chart.yaml b/charts/stable/postgresql/Chart.yaml
index 9295c424c62..1a7003bc869 100644
--- a/charts/stable/postgresql/Chart.yaml
+++ b/charts/stable/postgresql/Chart.yaml
@@ -25,4 +25,4 @@ name: postgresql
 sources:
 - https://www.postgresql.org/
 type: application
-version: 2.1.0
+version: 2.1.1
diff --git a/tools/build-release.sh b/tools/build-release.sh
index 80b4c0a0087..e87a75cb114 100755
--- a/tools/build-release.sh
+++ b/tools/build-release.sh
@@ -124,7 +124,7 @@ sync_tag() {
     local chartversion="$4"
     echo "Attempting to sync primary tag with appversion for: ${chartname}"
     local tag="$(cat ${chart}/values.yaml | grep '^  tag: ' | awk -F" " '{ print $2 }' | head -1)"
-    tag="${tag%%@sha256:}"
+    tag="${tagt%%@*}"
     tag="${tag:-auto}"
     tag="${tag#*release-}"
     tag="${tag#*version-}"