diff --git a/base b/base
index aaafa31e8f2e9c32982c672627f5bd067db62ca6..966d4bad56fbb192de83c501676926e11373f423 100644
--- a/base
+++ b/base
@@ -1,20 +1,34 @@
 FROM registry.fedoraproject.org/fedora:latest
 
-VOLUME /build
-WORKDIR /build
-ENV FLATPAK_GL_DRIVERS=dummy
+RUN dnf -y update && dnf install -y git 'dnf-command(builddep)' libtool \
+        automake gettext-devel autoconf && \
+    dnf builddep -y flatpak-builder && \
+    dnf groupinstall -y "Development Tools"
 
-RUN dnf -y update && \
-    dnf install -y flatpak flatpak-builder librsvg2 ostree fuse elfutils \
-    dconf dbus-daemon git bzr xorg-x11-server-Xvfb dbus-x11 && \
-    dnf clean all
+RUN git clone --recursive https://github.com/flatpak/flatpak-builder -b run-without-fuse && \
+    cd flatpak-builder && \
+    ./autogen.sh && make -j$(nproc)
+
+FROM registry.fedoraproject.org/fedora:latest
+COPY --from=0 /flatpak-builder/flatpak-builder /usr/local/bin/flatpak-builder
 
-RUN flatpak remote-add flathub https://dl.flathub.org/repo/flathub.flatpakrepo && \
-    flatpak remote-add gnome-nightly https://nightly.gnome.org/gnome-nightly.flatpakrepo && \
-    flatpak remote-add flathub-beta https://flathub.org/beta-repo/flathub-beta.flatpakrepo
+ENV FLATPAK_GL_DRIVERS=dummy
+
+RUN useradd --home-dir /build --create-home --shell /bin/bash build
+WORKDIR /build
 
 # Add a machine-id as specified in the freedesktop spec:
 # https://www.freedesktop.org/software/systemd/man/machine-id.html
 # gnome-builder test suite depends on this
 RUN cat /dev/urandom | tr -dc a-f0-9 | head -c32 > /etc/machine-id && echo "" >> /etc/machine-id
 
+RUN dnf -y update && \
+    dnf install -y flatpak librsvg2 ostree fuse elfutils \
+    dconf dbus-daemon git bzr xorg-x11-server-Xvfb dbus-x11 && \
+    dnf clean all
+
+USER build
+
+RUN flatpak remote-add --user flathub https://dl.flathub.org/repo/flathub.flatpakrepo && \
+    flatpak remote-add --user gnome-nightly https://nightly.gnome.org/gnome-nightly.flatpakrepo && \
+    flatpak remote-add --user flathub-beta https://flathub.org/beta-repo/flathub-beta.flatpakrepo
diff --git a/gnome-3-26/Dockerfile b/gnome-3-26/Dockerfile
index 664f53b24259d60069c1370023db6f8098c35ad9..0d832485e74590488bcb4a435c02e30050988334 100644
--- a/gnome-3-26/Dockerfile
+++ b/gnome-3-26/Dockerfile
@@ -1,3 +1,3 @@
 FROM registry.gitlab.gnome.org/gnome/gnome-runtime-images/base
 
-RUN flatpak install -y --noninteractive flathub org.gnome.Sdk//3.26 org.gnome.Sdk.Debug//3.26  org.gnome.Platform//3.26
+RUN flatpak install --user -y --noninteractive flathub org.gnome.Sdk//3.26 org.gnome.Sdk.Debug//3.26  org.gnome.Platform//3.26
diff --git a/gnome-3-28/Dockerfile b/gnome-3-28/Dockerfile
index 7911dca1144c73116a5088102e143dc666f636c8..e8ac8c9aaa561e5983e41c89ced6cc462fbe0497 100644
--- a/gnome-3-28/Dockerfile
+++ b/gnome-3-28/Dockerfile
@@ -1,3 +1,3 @@
 FROM registry.gitlab.gnome.org/gnome/gnome-runtime-images/base
 
-RUN flatpak install -y --noninteractive flathub org.gnome.Sdk//3.28 org.gnome.Sdk.Debug//3.28  org.gnome.Platform//3.28
+RUN flatpak install --user -y --noninteractive flathub org.gnome.Sdk//3.28 org.gnome.Sdk.Debug//3.28  org.gnome.Platform//3.28
diff --git a/gnome-3-30/Dockerfile b/gnome-3-30/Dockerfile
index ed898e98f4917462ed959a492a183b903316797a..9973fb98d405c35f9f9b5fb3376f93e47c02f299 100644
--- a/gnome-3-30/Dockerfile
+++ b/gnome-3-30/Dockerfile
@@ -1,3 +1,3 @@
 FROM registry.gitlab.gnome.org/gnome/gnome-runtime-images/base
 
-RUN flatpak install -y --noninteractive flathub org.gnome.Sdk//3.30 org.gnome.Platform//3.30
+RUN flatpak install --user -y --noninteractive flathub org.gnome.Sdk//3.30 org.gnome.Platform//3.30
diff --git a/gnome-3-32/Dockerfile b/gnome-3-32/Dockerfile
index 2be309d85b07c9f0f9d624a4ae44a8436152f2c2..2884aab60e98d47d757f7443e6b5ee0d8d725d0c 100644
--- a/gnome-3-32/Dockerfile
+++ b/gnome-3-32/Dockerfile
@@ -1,3 +1,3 @@
 FROM registry.gitlab.gnome.org/gnome/gnome-runtime-images/base
 
-RUN flatpak install -y --noninteractive flathub org.gnome.Sdk//3.32 org.gnome.Platform//3.32
+RUN flatpak install --user -y --noninteractive flathub org.gnome.Sdk//3.32 org.gnome.Platform//3.32
diff --git a/gnome-3-34/Dockerfile b/gnome-3-34/Dockerfile
index 7dbba12851fc735f2b6036f3b81bd0fb0073fd6c..8d2e34317fe201c2934f2ef950d882fc7fb0950d 100644
--- a/gnome-3-34/Dockerfile
+++ b/gnome-3-34/Dockerfile
@@ -1,3 +1,3 @@
 FROM registry.gitlab.gnome.org/gnome/gnome-runtime-images/base
 
-RUN flatpak install -y --noninteractive flathub org.gnome.Sdk//3.34 org.gnome.Platform//3.34
+RUN flatpak install --user -y --noninteractive flathub org.gnome.Sdk//3.34 org.gnome.Platform//3.34
diff --git a/gnome-master/Dockerfile b/gnome-master/Dockerfile
index 8438f2bb8de09999adcc0a0be9885f22c7b38e50..9f668d18790a88a3deb7a2f678509f7bf77f8ad7 100644
--- a/gnome-master/Dockerfile
+++ b/gnome-master/Dockerfile
@@ -1,3 +1,3 @@
 FROM registry.gitlab.gnome.org/gnome/gnome-runtime-images/base
 
-RUN flatpak install -y --noninteractive gnome-nightly org.gnome.Sdk org.gnome.Platform
+RUN flatpak install --user -y --noninteractive gnome-nightly org.gnome.Sdk org.gnome.Platform