diff --git a/archlinux.dockerfile b/archlinux.dockerfile
index 98b641b..711b0a9 100644
--- a/archlinux.dockerfile
+++ b/archlinux.dockerfile
@@ -19,8 +19,6 @@ COPY data /
 
 RUN systemctl set-default multi-user.target && \
     systemctl mask systemd-oomd low-memory-monitor rtkit-daemon udisks2 && \
-    useradd -m -U -G users,adm gnomeshell && \
-    truncate --size 0 /etc/machine-id && \
-    dconf update
+    truncate --size 0 /etc/machine-id
 
 CMD [ "/sbin/init" ]
diff --git a/data/etc/dbus-1/session.d/insecure.conf b/data/etc/dbus-1/session.d/insecure.conf
deleted file mode 100644
index 9930c9b..0000000
--- a/data/etc/dbus-1/session.d/insecure.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-    <apparmor mode="disabled"/>
-    <auth>ANONYMOUS</auth>
-    <allow_anonymous/>
-</busconfig>
diff --git a/debian.dockerfile b/debian.dockerfile
index 6a32b07..504568d 100644
--- a/debian.dockerfile
+++ b/debian.dockerfile
@@ -24,8 +24,6 @@ COPY data /
 
 RUN systemctl set-default multi-user.target && \
     systemctl mask systemd-oomd low-memory-monitor rtkit-daemon udisks2 && \
-    useradd -m -U -G users,adm gnomeshell && \
-    truncate --size 0 /etc/machine-id && \
-    dconf update
+    truncate --size 0 /etc/machine-id
 
 CMD [ "/sbin/init" ]
diff --git a/fedora.dockerfile b/fedora.dockerfile
index 3a6b564..78688ca 100644
--- a/fedora.dockerfile
+++ b/fedora.dockerfile
@@ -24,9 +24,7 @@ COPY data /
 
 RUN systemctl set-default multi-user.target && \
     systemctl mask systemd-oomd low-memory-monitor rtkit-daemon udisks2 && \
-    adduser -m -U -G users,adm gnomeshell && \
     chmod u+rw /etc/shadow && \
-    truncate --size 0 /etc/machine-id && \
-    dconf update
+    truncate --size 0 /etc/machine-id
 
 CMD [ "/sbin/init" ]
diff --git a/suse.dockerfile b/suse.dockerfile
index b9190d0..cf9838c 100644
--- a/suse.dockerfile
+++ b/suse.dockerfile
@@ -25,8 +25,6 @@ COPY data /
 
 RUN systemctl set-default multi-user.target && \
     systemctl mask systemd-oomd low-memory-monitor rtkit-daemon udisks2 && \
-    useradd -m -U -G users gnomeshell && \
-    truncate --size 0 /etc/machine-id && \
-    dconf update
+    truncate --size 0 /etc/machine-id
 
 CMD [ "/sbin/init" ]
diff --git a/test/test-wayland.sh b/test/test-wayland.sh
index 1b218fd..f6ad35c 100755
--- a/test/test-wayland.sh
+++ b/test/test-wayland.sh
@@ -27,10 +27,12 @@ ENV_VARS=(
 mkdir -p "${SHARED_DIR}/runtime" "${SHARED_DIR}/config" "${SHARED_DIR}/cache" "${SHARED_DIR}/state"
 chmod 0700 "${SHARED_DIR}/runtime" "${SHARED_DIR}/config" "${SHARED_DIR}/cache" "${SHARED_DIR}/state"
 
+UID="$(id -u)"
+
 set -ex
 
 CAPS="SYS_ADMIN,SYS_NICE,SYS_PTRACE,SETPCAP,NET_RAW,NET_BIND_SERVICE,IPC_LOCK"
-CID="$(podman create --log-driver=none --tty --cap-add="$CAPS" --security-opt=label=disable --user=0 --userns=keep-id:uid=1000,gid=1000 -v "$SHARED_DIR:$SHARED_DIR" "$1")"
+CID="$(podman create --log-driver=none --tty --cap-add="$CAPS" --security-opt=label=disable --user=0 --userns=keep-id -v "$SHARED_DIR:$SHARED_DIR" "$1")"
 
 trap shutdown EXIT
 
@@ -39,11 +41,11 @@ podman wait --condition=running "$CID"
 podman exec "$CID" busctl --watch-bind=true status
 podman exec "$CID" systemctl is-system-running --wait
 
-podman exec --user=1000 "${ENV_VARS[@]/#/--env=}" "$CID" dbus-daemon --session --nopidfile --syslog --fork "--address=unix:path=${SHARED_DIR}/runtime/bus"
-podman exec --user=1000 "${ENV_VARS[@]/#/--env=}" "$CID" busctl --user --watch-bind=true status
+podman exec "--user=$UID" "${ENV_VARS[@]/#/--env=}" "$CID" dbus-daemon --session --nopidfile --syslog --fork "--address=unix:path=${SHARED_DIR}/runtime/bus"
+podman exec "--user=$UID" "${ENV_VARS[@]/#/--env=}" "$CID" busctl --user --watch-bind=true status
 env "${ENV_VARS[@]}" dbus-send --session --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.Peer.Ping
 
-podman exec --user=1000 "${ENV_VARS[@]/#/--env=}" "$CID" gnome-shell --wayland --headless --sm-disable --unsafe-mode --virtual-monitor 1600x960 &
+podman exec "--user=$UID" "${ENV_VARS[@]/#/--env=}" "$CID" gnome-shell --wayland --headless --sm-disable --unsafe-mode --virtual-monitor 1600x960 &
 
 while ! env "${ENV_VARS[@]}" dbus-send --session --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.ListNames | grep '"org.gnome.Shell.Screenshot"'
 do
diff --git a/test/test-x11.sh b/test/test-x11.sh
index 40b5efd..c57ba0f 100755
--- a/test/test-x11.sh
+++ b/test/test-x11.sh
@@ -22,16 +22,17 @@ ENV_VARS=(
     "DBUS_SESSION_BUS_ADDRESS=unix:path=${SHARED_DIR}/runtime/bus"
     "NO_AT_BRIDGE=1"
     "GTK_A11Y=none"
-    "DISPLAY=:99"
 )
 
 mkdir -p "${SHARED_DIR}/runtime" "${SHARED_DIR}/config" "${SHARED_DIR}/cache" "${SHARED_DIR}/state"
 chmod 0700 "${SHARED_DIR}/runtime" "${SHARED_DIR}/config" "${SHARED_DIR}/cache" "${SHARED_DIR}/state"
 
+UID="$(id -u)"
+
 set -ex
 
 CAPS="SYS_ADMIN,SYS_NICE,SYS_PTRACE,SETPCAP,NET_RAW,NET_BIND_SERVICE,IPC_LOCK"
-CID="$(podman create --log-driver=none --tty --cap-add="$CAPS" --security-opt=label=disable --user=0 --userns=keep-id:uid=1000,gid=1000 -v "$SHARED_DIR:$SHARED_DIR" "$1")"
+CID="$(podman create --log-driver=none --tty --cap-add="$CAPS" --security-opt=label=disable --user=0 --userns=keep-id -v "$SHARED_DIR:$SHARED_DIR" "$1")"
 
 trap shutdown EXIT
 
@@ -40,17 +41,16 @@ podman wait --condition=running "$CID"
 podman exec "$CID" busctl --watch-bind=true status
 podman exec "$CID" systemctl is-system-running --wait
 
-podman exec --user=1000 "${ENV_VARS[@]/#/--env=}" "$CID" dbus-daemon --session --nopidfile --syslog --fork "--address=unix:path=${SHARED_DIR}/runtime/bus"
-podman exec --user=1000 "${ENV_VARS[@]/#/--env=}" "$CID" busctl --user --watch-bind=true status
+podman exec "--user=$UID" "${ENV_VARS[@]/#/--env=}" "$CID" dbus-daemon --session --nopidfile --syslog --fork "--address=unix:path=${SHARED_DIR}/runtime/bus"
+podman exec "--user=$UID" "${ENV_VARS[@]/#/--env=}" "$CID" busctl --user --watch-bind=true status
 env "${ENV_VARS[@]}" dbus-send --session --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.Peer.Ping
 
 mkfifo "${SHARED_DIR}/display_pipe"
-podman exec --user=1000 "${ENV_VARS[@]/#/--env=}" "$CID" bash -c "Xvfb -screen 0 1600x960x24 -nolisten tcp -displayfd 3 :99 3>'${SHARED_DIR}/display_pipe'" &
+podman exec "--user=$UID" "${ENV_VARS[@]/#/--env=}" "$CID" bash -c "Xvfb -screen 0 1600x960x24 -nolisten tcp -displayfd 3 3>'${SHARED_DIR}/display_pipe'" &
 
 read -r DISPLAY_NUMBER <"${SHARED_DIR}/display_pipe"
-test ":$DISPLAY_NUMBER" = ":99"
 
-podman exec --user=1000 "${ENV_VARS[@]/#/--env=}" "$CID" gnome-shell --x11 --sm-disable --unsafe-mode &
+podman exec "--user=$(id -u)" "${ENV_VARS[@]/#/--env=}" "--env=DISPLAY=:$DISPLAY_NUMBER" "$CID" gnome-shell --x11 --sm-disable --unsafe-mode &
 
 while ! env "${ENV_VARS[@]}" dbus-send --session --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.ListNames | grep '"org.gnome.Shell.Screenshot"'
 do