diff --git a/autostart/services/i3.service b/autostart/services/i3.service
index a1b8642..fa36c7c 100644
--- a/autostart/services/i3.service
+++ b/autostart/services/i3.service
@@ -1,6 +1,6 @@
 [Service]
 Type=simple
-ExecStart=/usr/bin/env i3 --config %h/.i3/config
+ExecStart=/usr/bin/env i3 --config %h/.config/i3/config
 PassEnvironment=DISPLAY
 
 Restart=no
diff --git a/user.yml b/user.yml
index 3ae4317..28fc2bf 100644
--- a/user.yml
+++ b/user.yml
@@ -54,6 +54,17 @@
     - "/home/{{ user.name }}/.config/systemd/"
     - "/home/{{ user.name }}/.config/systemd/user/"
 
+- name: stop xdg-user-dirs service
+  systemd_service:
+    name: xdg-user-dirs-update.service
+    scope: user
+    state: stopped
+
+- name: remove xdg user directory configuration
+  file:
+    path: "/home/{{ user.name }}/.config/user-dirs.dirs"
+    state: absent
+
 # No way to use the `systemd` module here, as it needs a logind
 # session. So we have to handle the symlinks for masking ourselves.
 - name: disable and mask systemd user units
@@ -66,6 +77,7 @@
     - gpg-agent-browser.socket
     - gpg-agent-ssh.socket
     - gpg-agent-extra.socket
+    - xdg-user-dirs-update.service
 
 - name: create directory for getty autologin
   file:
diff --git a/x/xinitrc b/x/xinitrc
index 22e06d3..b6b7e49 100644
--- a/x/xinitrc
+++ b/x/xinitrc
@@ -25,7 +25,6 @@ start_wm() {
     sleep 1
     systemctl --user start autostart.target
     sleep inf
-    # exec systemd-run --user --unit i3_user --pty --setenv=DISPLAY=${DISPLAY} i3 -c "$HOME/.i3/config" >> "$LOGDIR/i3/i3.log"
 }
 
 autostart() {