diff --git a/i3/Dockerfile b/i3/Dockerfile
index 4e62de2..72c8bf0 100644
--- a/i3/Dockerfile
+++ b/i3/Dockerfile
@@ -33,8 +33,9 @@ RUN --mount=type=cache,sharing=locked,target=/var/cache/pacman \
     && printf '%s\n' 'user ALL=(ALL:ALL) NOPASSWD: /usr/bin/pacman' \
         'Defaults lecture = never' >/etc/sudoers.d/zz-DOCKER \
     && passwd -l root >/dev/null 2>&1 \
-    && curl --fail -s -L https://raw.githubusercontent.com/KDE/plasma-workspace/master/menu/desktop/plasma-applications.menu -o /tmp/dolphinmenu \
-    && curl --fail -s -L https://raw.githubusercontent.com/i3/i3/next/etc/config | sed 's/exec i3-config-wizard/# &/' >/tmp/i3config
+    && install -d -o user -g users /home/user/.config/{menus,i3} \
+    && curl --fail -s -L https://raw.githubusercontent.com/KDE/plasma-workspace/master/menu/desktop/plasma-applications.menu -o /home/user/.config/menus/applications.menu \
+    && curl --fail -s -L https://raw.githubusercontent.com/i3/i3/next/etc/config | sed 's/exec i3-config-wizard/# &/' >/home/user/.config/i3/config
 
 # Default environment
 USER ${debug:-user}
diff --git a/i3/entrypoint b/i3/entrypoint
index aea2710..96c9a81 100755
--- a/i3/entrypoint
+++ b/i3/entrypoint
@@ -60,11 +60,7 @@ depth=32
 ${_MYVNC_VNCSHARING}
 vncconfig
 
-# i3 config
-cat /tmp/i3config >~/.config/i3/config
-
 # Dolphin default apps fix
-cat /tmp/dolphinmenu >~/.config/menus/applications.menu
 kbuildsycoca6
 
 # i3 status