diff --git a/roles/home-gui/files/xsession-netbsd b/roles/home-gui/files/xsession-netbsd
index 0ba8acf..875d221 100644
--- a/roles/home-gui/files/xsession-netbsd
+++ b/roles/home-gui/files/xsession-netbsd
@@ -1,7 +1,7 @@
 PATH=/usr/bin:/bin:/usr/X11R7/bin:/usr/pkg/bin
-export XDG_DATA_HOME=$HOME/.local/share
-export XDG_DATA_DIRS=/usr/local/share:/usr/share:/usr/pkg/share
+XDG_DATA_HOME=$HOME/.local/share
+XDG_DATA_DIRS=/usr/local/share:/usr/share:/usr/pkg/share
 xrdb -merge ~/.Xresources
 xset b off
 setxkbmap gb
-exec ssh-agent mate-session
+exec ssh-agent /usr/X11R7/bin/twm
diff --git a/roles/netbsd/tasks/packages-gui.yml b/roles/netbsd/tasks/packages-gui.yml
index 9d15128..694b2b4 100644
--- a/roles/netbsd/tasks/packages-gui.yml
+++ b/roles/netbsd/tasks/packages-gui.yml
@@ -8,10 +8,8 @@
     packages:
       - adwaita-icon-theme
       - atril
-      - dbus
       - firefox
       - liberation-ttf
-      - mate
-      - rxvt-unicode
+      - mate-terminal
       - vim-gtk3
       - xlockmore-lite