diff --git a/.github/workflows/bump-modules.yml b/.github/workflows/bump-modules.yml
index 4eb32615..ab260710 100644
--- a/.github/workflows/bump-modules.yml
+++ b/.github/workflows/bump-modules.yml
@@ -11,13 +11,19 @@ permissions:
 jobs:
   update-Modules:
     runs-on: ubuntu-22.04
+    env:
+      COMMIT_NAME: github-actions[bot] 
+      COMMIT_EMAIL: 41898282+github-actions[bot]@users.noreply.github.com
     steps:
       - name: Clone Firmware
         uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
 
+      - name: Configure Git User and E-Mail
+        run: git config --global user.name "${{ env.COMMIT_NAME }}" && git config --global user.email "${{ env.COMMIT_EMAIL }}"
+        
       - name: Get update branch name
         id: branch-name
-        run: echo "branch-name=update-modules-${{ github.event.inputs.branch }}-$(date +%s)" >> $GITHUB_OUTPUT
+        run: echo "branch-name=update-modules-${{ github.ref_name }}-$(date +%s)" >> $GITHUB_OUTPUT
 
       - name: Invoke update-modules
         run: ./contrib/actions/update-modules.sh
@@ -26,14 +32,16 @@ jobs:
         id: cpr
         uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c # v6.1.0
         with:
-          title: '[Update] ${{ github.event.inputs.branch }} modules'
+          title: '[${{ github.ref_name }}] update modules'
           body: |
-            Update modules for ${{ github.event.inputs.branch }} branche
-            - Auto-generated by [create-pull-request][1]
+            Update modules for ${{ github.ref_name }} branch
+            <sub><sup>- Auto-generated by [create-pull-request][1]</sub></sup>
 
             [1]: https://github.com/peter-evans/create-pull-request
-          commit-message: bump modules version
           branch: ${{ steps.branch-name.outputs.branch-name }}
+          labels: ${{ github.ref_name }}
+          draft: true # this step does not trigger a CI run, so always mark them as draft
+          delete-branch: true
 
       - name: Check outputs
         if: ${{ steps.cpr.outputs.pull-request-number }}
diff --git a/contrib/actions/update-modules.sh b/contrib/actions/update-modules.sh
index cf080758..bd2bfdcc 100755
--- a/contrib/actions/update-modules.sh
+++ b/contrib/actions/update-modules.sh
@@ -1,39 +1,63 @@
-#!/bin/bash
-set -eEu
-set -o pipefail
+#!/usr/bin/env bash
 
-# file that contains the module information
-MODULES_FILE="modules"
+set -eo pipefail
 
-if ((BASH_VERSINFO[0] < 4)); then
-    echo "This script requires Bash 4.0 or above."
-    exit 1
-fi
+# move to basedir, in case the script is not executed via `make update-modules`
+cd "$(dirname "$0")/../.." || exit 1
 
-function get_value_from_line() {
-    cat | cut -d '=' -f 2
-}
+# shellcheck source=./modules
+source ./modules
 
-function get_all_repo_names() {
-    local file=$1
-    grep "^GLUON_SITE_FEEDS" "${file}" | get_value_from_line | tr -d "'"
+git diff --quiet ./modules || {
+	1>&2 echo "Your modules file is dirty, aborting."
+	exit 1
 }
 
-for repo in $(get_all_repo_names "${MODULES_FILE}"); do
-    REPO_URL=$(grep "^PACKAGES_${repo^^}_REPO" "${MODULES_FILE}" | get_value_from_line)
-    REPO_COMMIT=$(grep "^PACKAGES_${repo^^}_COMMIT" "${MODULES_FILE}" | get_value_from_line)
-    REPO_BRANCH=$(grep "^PACKAGES_${repo^^}_BRANCH" "${MODULES_FILE}" | get_value_from_line)
 
-    # Get newest commit of the repo
-    NEW_COMMIT=$(git ls-remote --heads "${REPO_URL}" "${REPO_BRANCH}" | grep -oE '[0-9a-f]{40}')
+for MODULE in ${GLUON_SITE_FEEDS}; do
+	_REMOTE_URL=PACKAGES_${MODULE^^}_REPO
+	_REMOTE_BRANCH=PACKAGES_${MODULE^^}_BRANCH
+	_LOCAL_HEAD=PACKAGES_${MODULE^^}_COMMIT
+
+	REMOTE_URL="${!_REMOTE_URL}"
+	REMOTE_BRANCH="${!_REMOTE_BRANCH}"
+	LOCAL_HEAD="${!_LOCAL_HEAD}"
+
+	# get default branch name if none is set
+	[ -z "${REMOTE_BRANCH}" ] && {
+		REMOTE_BRANCH=$(git ls-remote --symref "${REMOTE_URL}" HEAD | awk '/^ref:/ { sub(/refs\/heads\//, "", $2); print $2 }')
+	}
+
+	# fetch the commit id for the HEAD of the module
+	REMOTE_HEAD=$(git ls-remote "${REMOTE_URL}" "${REMOTE_BRANCH}" | awk '{ print $1 }')
+
+	# skip ahead if the commit id did not change
+	[ "$LOCAL_HEAD" == "$REMOTE_HEAD" ] && continue 1
+
+
+
+	CHECKOUT=$(mktemp -d)
+
+	# clone the target branch
+	git clone --bare "${REMOTE_URL}" --branch="${REMOTE_BRANCH}" "${CHECKOUT}"
+
+	# prepare the commit message
+	# shellcheck disable=SC2001
+	MODULE=$(echo "${MODULE,,}" | sed 's/packages_//')
+	TITLE="modules: update ${MODULE}"
+	MESSAGE="$(mktemp)"
+	{
+		echo "${TITLE}"
+		printf '\n\n'
+		git -C "${CHECKOUT}" log --oneline --no-decorate --no-merges "${LOCAL_HEAD}..${REMOTE_HEAD}" | cat
+	} > "$MESSAGE"
+
+	# modify modules file
+	sed -i "s/${LOCAL_HEAD}/${REMOTE_HEAD}/" ./modules
+	git add ./modules
 
-    # Check if the commit has changed
-    if [[ "${REPO_COMMIT}" == "${NEW_COMMIT}" ]]; then
-        echo "No updates for ${repo} repository"
-        continue
-    fi
+	git commit -F "${MESSAGE}"
 
-    # Update the value of the commit
-    sed -i "s/${REPO_COMMIT}/${NEW_COMMIT}/" "${MODULES_FILE}"
-    echo "Updated commit of ${repo} (${REPO_COMMIT}) to the newest commit (${NEW_COMMIT})."
+	# remove the checkout
+	rm -fr "${CHECKOUT}"
 done