diff --git a/.github/workflows/renovate.yaml b/.github/workflows/renovate.yaml
index aa66cad0f..087e124d6 100644
--- a/.github/workflows/renovate.yaml
+++ b/.github/workflows/renovate.yaml
@@ -32,6 +32,7 @@ jobs:
           # renovate: datasource=docker depName=ghcr.io/renovatebot/renovate
           renovate-version: 39.86.4
           token: '${{ steps.get_token.outputs.token }}'
+          mount-docker-socket: true
         env:
           LOG_LEVEL: 'debug'
           RENOVATE_REPOSITORIES: '${{ github.repository }}'
diff --git a/renovate.json b/renovate.json
index dcf912492..1ee051f5f 100644
--- a/renovate.json
+++ b/renovate.json
@@ -83,31 +83,24 @@
         "argoproj/argo-workflows",
         "argoproj/argo-cd",
         "argoproj/argo-events",
-        "argoproj/argo-rollouts"
+        "argoproj/argo-rollouts",
+        "argoproj-labs/argocd-image-updater",
+        "argoprojlabs/argocd-extension-installer",
+        "public.ecr.aws/bitnami/redis-exporter",
+        "public.ecr.aws/docker/library/redis"
       ],
-      "commitMessagePrefix": "chore({{{replace 'argoproj/' '' depName}}}):",
+      "commitMessagePrefix": "chore({{parentDir}}):",
       "postUpgradeTasks": {
-        "commands": ["./scripts/renovate-bump-version.sh {{depName}}"]
-      }
-    },
-    {
-      "matchPackagePatterns": ["argoproj-labs/argocd-image-updater"],
-      "commitMessagePrefix": "chore({{{replace 'argoproj-labs/' '' depName}}}):",
-      "postUpgradeTasks": {
-        "commands": ["./scripts/renovate-bump-version.sh {{depName}}"]
+        "commands": [
+          "./scripts/renovate-bump-version.sh -c {{parentDir}} -d {{depName}} -v {{newVersion}}",
+          "./scripts/helm-docs.sh"
+        ]
       }
     },
     {
       "matchPackagePatterns": ["redis-ha"],
       "enabled": false
     },
-    {
-      "matchPackagePatterns": ["public.ecr.aws/bitnami/redis-exporter"],
-      "commitMessagePrefix": "chore({{{replace 'public.ecr.aws/' '' depName}}}):",
-      "postUpgradeTasks": {
-        "commands": ["./scripts/renovate-bump-version.sh {{depName}}"]
-      }
-    },
     {
       "matchPackageNames": ["ghcr.io/renovatebot/renovate"],
       "extends": ["schedule:monthly"]
diff --git a/scripts/renovate-bump-version.sh b/scripts/renovate-bump-version.sh
index 1ec6e125d..80f1ae117 100755
--- a/scripts/renovate-bump-version.sh
+++ b/scripts/renovate-bump-version.sh
@@ -1,31 +1,41 @@
 #!/bin/bash
-depName="${1}"
-if [ -z "${depName}" ]; then
-  echo "Missing argument 'depName'" >&2
-  echo "Example usage: $0 argoproj/argo-cd" >&2
+while getopts c:d:v: opt; do
+  case ${opt} in
+    c) chart=${OPTARG} ;;
+    d) dependency_name=${OPTARG} ;;
+    v) dependency_version=${OPTARG} ;;
+    *)
+      echo 'Usage:' >&2
+      echo '-c: chart       Related Helm chart name' >&2
+      echo '-d  dependency  Name of the updated dependency' >&2
+      echo '-v  version     New version of the updated dependency' >&2
+      exit 1
+  esac
+done
+
+if [ -z "${dependency_name}" ] || [ -z "${dependency_version}" ] || [ -z "${chart}" ] ; then
+  echo 'Missing relevant CLI flag(s).' >&2
   exit 1
 fi
 
-chartName=$(echo "$depName" | sed -e "s+^argoproj/++" -e "s+^argoproj-labs/++")
-echo "Changed chart name is: $chartName"
-echo "----------------------------------------"
-
-parentDir="charts/${chartName}"
+chart_yaml_path="charts/${chart}/Chart.yaml"
+# Split dependency by '/' and only use last element
+# This way we can drop prefixes like "argoproj/..." , "argoproj-labs/..." , "quay.io/foo/..."
+dependency_name="${dependency_name##*/}"
 
 # Bump the chart version by one patch version
-version=$(grep '^version:' "${parentDir}/Chart.yaml" | awk '{print $2}')
+version=$(grep '^version:' "${chart_yaml_path}" | awk '{print $2}')
 major=$(echo "${version}" | cut -d. -f1)
 minor=$(echo "${version}" | cut -d. -f2)
 patch=$(echo "${version}" | cut -d. -f3)
 patch=$((patch + 1))
-sed -i "s/^version:.*/version: ${major}.${minor}.${patch}/g" "${parentDir}/Chart.yaml"
+sed -i "s/^version:.*/version: ${major}.${minor}.${patch}/g" "${chart_yaml_path}"
 
 # Add a changelog entry
-appVersion=$(grep '^appVersion:' "${parentDir}/Chart.yaml" | awk '{print $2}')
-sed -i -e '/^  artifacthub.io\/changes: |/,$ d' "${parentDir}/Chart.yaml"
+sed -i -e '/^  artifacthub.io\/changes: |/,$ d' "${chart_yaml_path}"
 {
   echo "  artifacthub.io/changes: |"
   echo "    - kind: changed"
-  echo "      description: Bump ${chartName} to ${appVersion}"
-} >> "${parentDir}/Chart.yaml"
-cat "${parentDir}/Chart.yaml"
+  echo "      description: Bump ${dependency_name} to ${dependency_version}"
+} >> "${chart_yaml_path}"
+cat "${chart_yaml_path}"