diff --git a/.github/workflows/update-sh.yml b/.github/workflows/update-sh.yml
index a8c6ff3e9..537730014 100644
--- a/.github/workflows/update-sh.yml
+++ b/.github/workflows/update-sh.yml
@@ -9,6 +9,7 @@ on:
   push:
     branches:
     - master
+    - update.sh-fix-branch-creation
   schedule:
   - cron:  '11 0 * * *'
   workflow_dispatch:
@@ -30,11 +31,11 @@ jobs:
         # Exit early if no changes are present.
         test $(git status --porcelain | wc -l) -gt 0 || { echo "No changes to commit, happily cancelling this script."; exit 0; }
         # Use a distinct branch-name (nano-seconds should be good enough).
-        BRANCH="changes-from-update.sh-$(date -I ns)"
+        BRANCH="changes-from-update.sh-$(date +'%Y-%m-%d_%H%M%S_%N')"
         git switch -C "$BRANCH"
         git config --local user.email "workflow@github.com"
         git config --local user.name "GitHub Workflow"
         git add -A
         git commit -m "Update roundcube version (via update.sh)"
         git push --set-upstream origin "$BRANCH"
-        gh pr create -B master -H changes-from-update.sh --title 'Changes from update.sh' --body "These are the changes of the automated run of ./update.sh" --assignee pabzm
+        gh pr create -B master -H "$BRANCH" --title 'Changes from update.sh' --body "These are the changes of the automated run of ./update.sh" --assignee pabzm
diff --git a/apache/Dockerfile b/apache/Dockerfile
index 24e5c56c3..c2e5ecce0 100644
--- a/apache/Dockerfile
+++ b/apache/Dockerfile
@@ -56,6 +56,8 @@ RUN set -ex; \
 	; \
 	docker-php-ext-enable imagick opcache redis; \
 	docker-php-source delete; \
+# Header files ".h"
+	rm -r /usr/local/include/php/ext; \
 	rm -r /tmp/pear; \
 # Display installed modules
 	php -m; \