diff --git a/desktop/tasks/kde.yml b/desktop/tasks/kde.yml
index 5882cdff343d5e75d3d7b301dbe52ff75aeb2d48..c69c815666fabededdbca808d350d4693f266e2d 100644
--- a/desktop/tasks/kde.yml
+++ b/desktop/tasks/kde.yml
@@ -1,113 +1,16 @@
 ---
 
-- name: ensure reasonable subset of kde-baseapps is installed
+- name: Install KDE packages
   apt:
     name:
-      - dolphin
-      - kdialog
-      - keditbookmarks
-      - kfind
-      - konsole
-      - kwrite
+      - kde-standard
+      - kdeutils
+      - kdesdk
     state: present
   tags:
     - packages
     - kde
     - desktop
-    - kde-baseapps
-
-- name: ensure reasonable subset of kde-plasma-desktop is installed
-  apt:
-    name:
-      - plasma-desktop
-      - plasma-workspace
-      - kde-runtime
-      - udisks2
-      - upower
-      - kwin-x11
-      - sddm
-      - sddm-theme-breeze
-      - xserver-xorg
-    state: present
-  tags:
-    - packages
-    - kde
-    - desktop
-    - kde-plasma-desktop
-
-- name: ensure reasonable subset of kde-standard is installed
-  apt:
-    name:
-      - akregator
-      - ark
-      - gwenview
-      - kaddressbook
-      - kate
-      - kcalc
-      - kde-spectacle
-      - khelpcenter
-      - kmail
-      - knotes
-      - kopete
-      - korganizer
-      - kwalletmanager
-      - okular
-      - plasma-dataengines-addons
-      - plasma-pa
-      - plasma-runners-addons
-      - plasma-wallpapers-addons
-      - plasma-widgets-addons
-      - polkit-kde-agent-1
-      - sweeper
-    state: present
-  tags:
-    - packages
-    - kde
-    - desktop
-    - kde-standard
-
-- name: ensure reasonable subset of kdeutils is installed
-  apt:
-    name:
-      - ark
-      - filelight
-      - kcalc
-      - kcharselect
-      - kdf
-      - kgpg
-      - ktimer
-      - kwalletmanager
-      - sweeper
-      - print-manager
-    state: present
-  tags:
-    - packages
-    - kde
-    - desktop
-    - kdeutils
-
-- name: ensure reasonable subset of kdesdk is installed
-  apt:
-    name:
-      - dolphin-plugins
-      - kapptemplate
-      - kate
-      - kcachegrind
-      - kdesdk-scripts
-      - kdesdk-thumbnailers
-      - kompare
-      - kpartloader
-      - kuiviewer
-      - lokalize
-      - okteta
-      - poxml
-      - umbrello
-    state: present
-  tags:
-    - packages
-    - kde
-    - desktop
-    - kdesdk
 
 - name: ensure reasonable subset of kde-full is installed
   apt:
@@ -135,20 +38,24 @@
       - kde-config-systemd
       - kwave
       - gtk2-engines-oxygen
-      - gtk3-engines-breeze
+      - breeze-gtk-theme
       - kde-config-gtk-style
-      - kde-l10n-de
-      - krdc
     state: present
   tags:
     - packages
     - kde
     - desktop
 
-- name: ensure kde nepomuk is disabled
-  file:
-    path: /usr/share/autostart/nepomukserver.desktop
-    state: absent
+- name: Install SDDM
+  apt:
+    name:
+      - sddm
+      - sddm-theme-breeze
+    state: present
+  tags:
+    - packages
+    - kde
+    - desktop
 
 - name: ensure we got a properly configured sddm
   copy:
diff --git a/desktop/tasks/software.yml b/desktop/tasks/software.yml
index d6e9a85a68ba7962ec5e68fdc2140031aadb431f..74c5cf0231e919651e7e0c89ad713d8579bd3d92 100644
--- a/desktop/tasks/software.yml
+++ b/desktop/tasks/software.yml
@@ -227,7 +227,6 @@
       - update-manager-core
       - update-manager-gnome
       - popularity-contest
-      - konqueror
       - haveged
       - lirc