diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bb46af5..2eb8e9d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -281,11 +281,11 @@ publish:
     - 'git commit
         -m "archlinux: Release ${BUILD_VERSION}"
         -m "This is an automated release [1]."
-        -m "Maintainers: ${maintainers}"
         -m "[1] ${CI_PROJECT_URL}/-/blob/master/.gitlab-ci.yml"'
     - git push -u origin "$head"
-    - gh pr create
+    - 'gh pr create
         --repo docker-library/official-images
-        --fill
+        --title "$(git show --no-patch --format="%s")"
+        --body "$(printf "%s\n\n---\n\nMaintainers: ${maintainers}\n" "$(git show --no-patch --format="%b")")"
         --base master
-        --head archlinux:"$head"
+        --head archlinux:"$head"'
diff --git a/Dockerfile.base b/Dockerfile.base
index bdfc042..a5b2712 100644
--- a/Dockerfile.base
+++ b/Dockerfile.base
@@ -11,9 +11,9 @@
 FROM alpine:3.12 AS verify
 RUN apk add --no-cache curl bash
 SHELL ["/bin/bash", "-c"]
-# https://gitlab.archlinux.org/archlinux/archlinux-docker/-/releases/v20210405.0.19136
-RUN ROOTFS="$(curl -sOJL --continue-at - -w "%{filename_effective}" https://gitlab.archlinux.org/archlinux/archlinux-docker/-/package_files/765/download)" && \
-    sha256sum -c <<< "b2813c64dc4a9fb83f24aec470f38505125160b80feaac0fce5869584414393e  base-20210405.0.19136.tar.xz" && \
+# https://gitlab.archlinux.org/archlinux/archlinux-docker/-/releases/v20210406.0.19352
+RUN ROOTFS="$(curl -sOJL --continue-at - -w "%{filename_effective}" https://gitlab.archlinux.org/archlinux/archlinux-docker/-/package_files/769/download)" && \
+    sha256sum -c <<< "5f9928dde0541f1891abc68b5cc75aeeee6dbfb85e72aef3fe62ecc9a7a46ea3  base-20210406.0.19352.tar.xz" && \
     mkdir /rootfs && \
     tar -C /rootfs --extract --file "${ROOTFS}"
 
diff --git a/Dockerfile.base-devel b/Dockerfile.base-devel
index 842f575..8ffd3ed 100644
--- a/Dockerfile.base-devel
+++ b/Dockerfile.base-devel
@@ -11,9 +11,9 @@
 FROM alpine:3.12 AS verify
 RUN apk add --no-cache curl bash
 SHELL ["/bin/bash", "-c"]
-# https://gitlab.archlinux.org/archlinux/archlinux-docker/-/releases/v20210405.0.19136
-RUN ROOTFS="$(curl -sOJL --continue-at - -w "%{filename_effective}" https://gitlab.archlinux.org/archlinux/archlinux-docker/-/package_files/767/download)" && \
-    sha256sum -c <<< "2c790984b34f7eacf0167c8176cee958276086b69314929ca2b20e564303db7a  base-devel-20210405.0.19136.tar.xz" && \
+# https://gitlab.archlinux.org/archlinux/archlinux-docker/-/releases/v20210406.0.19352
+RUN ROOTFS="$(curl -sOJL --continue-at - -w "%{filename_effective}" https://gitlab.archlinux.org/archlinux/archlinux-docker/-/package_files/771/download)" && \
+    sha256sum -c <<< "f0abe46fc0ee7ebf5d32efdccc11d96b797181b6516e659876021628bcebbb24  base-devel-20210406.0.19352.tar.xz" && \
     mkdir /rootfs && \
     tar -C /rootfs --extract --file "${ROOTFS}"