diff --git a/build-base/Dockerfile b/build-base/Dockerfile
index b6cc063..6d43a9d 100644
--- a/build-base/Dockerfile
+++ b/build-base/Dockerfile
@@ -12,8 +12,8 @@ RUN apt update && \
 # Build and install patched WINE (see https://github.com/msys2/MSYS2-packages/issues/682)
 RUN git clone --filter=tree:0 https://gitlab.winehq.org/jhol/wine.git /tmp/winesrc && \
     cd /tmp/winesrc && \
-    # https://gitlab.winehq.org/jhol/wine/-/commits/msys2-hacks-21
-    git checkout 8ea3a1155e80d004aeeb5651f51e07d96a37a78c && \
+    # https://gitlab.winehq.org/jhol/wine/-/commits/msys2-hacks-22
+    git checkout 2aa524aec434517843ffa1d52ad1982f86fdd074 && \
     ./configure --disable-tests --enable-win64 --with-mingw --enable-archs=x86_64,i386 && \
     make -j $(nproc) && \
     env DESTDIR=/wine make -j $(nproc) install && \
diff --git a/msys2/Dockerfile b/msys2/Dockerfile
index e0c34c3..ad323b6 100644
--- a/msys2/Dockerfile
+++ b/msys2/Dockerfile
@@ -15,8 +15,11 @@ RUN apt update \
 COPY --from=build /wine /
 RUN ldconfig
 
+# Avoid "tzset" startup warning + and wineboot crashing
+ENV TZ=UTC
+
 # XXX: otherwise things hang
-RUN winecfg
+RUN WINEDEBUG=-all wineboot --init
 
 # Copy over MSYS2
 COPY --from=build /tmp/msys64 /root/.wine/drive_c/msys64