diff --git a/roles/freebsd/tasks/packages-cli.yml b/roles/freebsd/tasks/packages-cli.yml
index efc7254..47dd95f 100644
--- a/roles/freebsd/tasks/packages-cli.yml
+++ b/roles/freebsd/tasks/packages-cli.yml
@@ -2,7 +2,7 @@
 - name: Install core CLI packages
   become: true
   pkgng:
-    name: drm-kmod,en-freebsd-doc,git,pkg,py36-ansible,sudo
+    name: drm-kmod,en-freebsd-doc,git,pkg,py37-ansible,sudo
     state: present
 - name: Install additional CLI packages
   become: true
@@ -17,7 +17,7 @@
       - mc
       - nmap
       - openvpn
-      - py36-psutil
+      - py37-psutil
       - rubygem-asciidoctor
       - sqlite3
       - tmux
diff --git a/roles/freebsd/tasks/packages-gui.yml b/roles/freebsd/tasks/packages-gui.yml
index 02a0640..d19548c 100644
--- a/roles/freebsd/tasks/packages-gui.yml
+++ b/roles/freebsd/tasks/packages-gui.yml
@@ -11,26 +11,22 @@
     state: present
   vars:
     packages:
-      - adwaita-icon-theme
-      - atril
       - dbus
       - emacs
       - en_GB-libreoffice
       - firefox-esr
-      - fvwm
       - galculator
       - git-gui
       - iosevka
+      - kde5
       - liberation-fonts-ttf
       - libreoffice
-      - luit
-      - mate-terminal
       - mpv
       - nextcloudclient
       - redshift
       - remmina
       - remmina-plugin-rdp
       - rxvt-unicode
-      - seahorse
+      - sddm
       - vim
       - xinput
diff --git a/roles/freebsd/tasks/rc.yml b/roles/freebsd/tasks/rc.yml
index 66bf931..5a41cfa 100644
--- a/roles/freebsd/tasks/rc.yml
+++ b/roles/freebsd/tasks/rc.yml
@@ -23,3 +23,9 @@
     path: /etc/rc.conf
     regexp: '^ifconfig_wlan0_ipv6=.*'
     line: 'ifconfig_wlan0_ipv6="inet6 accept_rtadv"'
+- name: Enable SDDM
+  become: true
+  lineinfile:
+    path: /etc/rc.conf
+    regexp: '^sddm_enable=.*'
+    line: 'sddm_enable="YES"'
diff --git a/roles/freebsd/tasks/xorg.yml b/roles/freebsd/tasks/xorg.yml
index 85c8f89..260f47b 100644
--- a/roles/freebsd/tasks/xorg.yml
+++ b/roles/freebsd/tasks/xorg.yml
@@ -5,12 +5,6 @@
     name: dbus
     state: started
     enabled: yes
-- name: Enable XDM
-  become: true
-  lineinfile:
-    path: /etc/ttys
-    regexp: '^ttyv8\s.*'
-    line: 'ttyv8	"/usr/local/bin/xdm -nodaemon"	xterm	on  secure'
 - name: Set xorg keyboard layout
   become: true
   copy:
diff --git a/roles/home-gui/files/xsession-freebsd b/roles/home-gui/files/xsession-freebsd
deleted file mode 100644
index 4122887..0000000
--- a/roles/home-gui/files/xsession-freebsd
+++ /dev/null
@@ -1,6 +0,0 @@
-PATH=/usr/bin:/bin:/usr/local/bin
-xrdb -merge ~/.Xresources
-xset b off
-stalonetray &
-redshift &
-exec ssh-agent fvwm
diff --git a/roles/home-gui/tasks/dotfiles.yml b/roles/home-gui/tasks/dotfiles.yml
index c6bf6bc..4f5fdc8 100644
--- a/roles/home-gui/tasks/dotfiles.yml
+++ b/roles/home-gui/tasks/dotfiles.yml
@@ -27,11 +27,6 @@
   copy:
     src: stalonetrayrc
     dest: "{{ ansible_env.HOME }}/.stalonetrayrc"
-- name: Create FreeBSD xsession file
-  copy:
-    src: xsession-freebsd
-    dest: "{{ ansible_env.HOME }}/.xsession"
-  when: ansible_system == "FreeBSD"
 - name: Create fvwm config file
   copy:
     src: fvwmrc