diff --git a/client/Dockerfiles/local/finance/archlinux/Dockerfile.root.in b/client/Dockerfiles/local/finance/archlinux/Dockerfile.root.in
index 21b36d1..03e08d9 100644
--- a/client/Dockerfiles/local/finance/archlinux/Dockerfile.root.in
+++ b/client/Dockerfiles/local/finance/archlinux/Dockerfile.root.in
@@ -21,13 +21,16 @@
 
 USER root
 
+# Prevent system upgrades from using Arch's `root` package
+RUN sed -i 's:^#IgnorePkg   =:IgnorePkg   = root:' /etc/pacman.conf
+
 # ROOT.cern
 # https://hub.docker.com/r/evergreencrypto/root
-COPY --from=evergreencrypto/root:archlinux /home/builder/root/root-6.36.04-6-x86_64.pkg.tar.zst /usr/local/src/
+COPY --from=evergreencrypto/root:archlinux /root/root-*.pkg.tar.zst /usr/local/src/
 
 WORKDIR /usr/local/src
 RUN pacman -Syu --noconfirm --disable-download-timeout
-RUN pacman -U root-6.36.04-6-x86_64.pkg.tar.zst --noconfirm --disable-download-timeout
+RUN pacman -U root-*.pkg.tar.zst --noconfirm --disable-download-timeout
 
 # docker-finance
 RUN pacman -Syu \
diff --git a/client/Dockerfiles/remote/root/Dockerfile.archlinux b/client/Dockerfiles/remote/root/Dockerfile.archlinux
index 6dca1a9..260bcc3 100644
--- a/client/Dockerfiles/remote/root/Dockerfile.archlinux
+++ b/client/Dockerfiles/remote/root/Dockerfile.archlinux
@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-FROM archlinux:base-devel
+FROM archlinux:base-devel AS base-devel
 
 RUN pacman -Syu \
   git \
@@ -27,7 +27,7 @@ RUN sed -i 's/# %wheel ALL=(ALL:ALL) NOPASSWD: ALL/%wheel ALL=(ALL:ALL) NOPASSWD
 
 USER builder
 WORKDIR /home/builder
-RUN git clone --depth=1 https://gitlab.archlinux.org/archlinux/packaging/packages/root -b 6.36.04-6
+RUN git clone --depth=1 https://gitlab.archlinux.org/archlinux/packaging/packages/root -b 6.38.00-1
 
 WORKDIR /home/builder/root
 
@@ -54,7 +54,7 @@ RUN sed -i -e 's/qt6web ON/qt6web OFF/' settings.cmake
 RUN sed -i -e 's/x11 ON/x11 OFF/' settings.cmake
 
 # Update final b2sum of settings.cmake
-RUN sed -i 's/ef29766c708426631b50b4d63f036cd4dd0155201a6a7c3d8efe719eb749f41a48b45369ec76688ee3109c4ce118b041a8725a9ec88313e0aa43169f786e1b9d/55b4b4d8f7caddfe5b5d0e48e86dfa42dd2f092b2988b298a646e7dfe540192c8a9a7fcc4a14b46a6265764b0c242d3b7bdd40488e7ce960527710462d4f04a4/' PKGBUILD
+RUN sed -i 's/6eacf425d2a75e7bcabbf9d1b3bcf4c7d06093774ef1adee9131c582caac68d433fdfafc2772032d02a996849d7b81e369bdbf1298992d0b37630108b90a193c/412eac1f470fe544e2143511aae89aa91301cb9c4fa0fa1bdee99b875d7846e2f735a3a09d21d4fd6e82ec28ca6a05980090deda94807050fc5e45a6cfcd5e9c/' PKGBUILD
 
 #
 # PKGBUILD
@@ -78,6 +78,22 @@ RUN sed -i -e '/^  qt6-webengine$/d' PKGBUILD
 # Do not build root debug package
 RUN sed -i "s/options=(\!lto)$/options=('\!debug' '\!lto')/" PKGBUILD
 
-RUN PACKAGER="https://gitea.com/EvergreenCrypto/docker-finance" makepkg -sci --noconfirm
+# Execute build
+RUN PACKAGER="https://gitea.com/EvergreenCrypto/docker-finance" makepkg -s --noconfirm
+
+#
+# Production stage
+#
+
+FROM archlinux:base
+
+COPY --from=base-devel /home/builder/root/root-*.pkg.tar.zst /root/
+
+RUN pacman -Syu \
+  gcc \
+  --noconfirm --disable-download-timeout
+
+WORKDIR /root
+RUN pacman -U root-*.pkg.tar.zst --noconfirm
 
 # vim: sw=2 sts=2 si ai et