diff --git a/desktop/tasks/configuration.yml b/desktop/tasks/configuration.yml
index d8968c272783e1d31fe7218140234635455663be..1537c8395b3345c4f283a4f30cf9a5e0c13b5b23 100644
--- a/desktop/tasks/configuration.yml
+++ b/desktop/tasks/configuration.yml
@@ -12,7 +12,7 @@
 - name: ensure a sane default web browser
   alternatives:
     name: x-www-browser
-    path: /usr/bin/firefox
+    path: /usr/bin/firefox-esr
 
 - name: ensure we have the correct printer
   template:
diff --git a/desktop/tasks/software.yml b/desktop/tasks/software.yml
index 74c5cf0231e919651e7e0c89ad713d8579bd3d92..8299064e5d162951f66dc04d295b44b429512b9e 100644
--- a/desktop/tasks/software.yml
+++ b/desktop/tasks/software.yml
@@ -1,14 +1,12 @@
 ---
 # file: roles/client/tasks/desktop.yml
 
-- name: Install Intel and Realtek firmware for Dell clients
+- name: Install firmware
   apt:
     name:
-      - firmware-misc-nonfree
-      - firmware-realtek
-      - firmware-iwlwifi
+      - firmware-linux
     state: present
-  when: ansible_system_vendor == "Dell Inc."
+  when: ansible_virtualization_role != "guest"
 
 - name: ensure office applications are installed
   apt:
@@ -16,7 +14,6 @@
       - libreoffice  # this is a meta-package
       - libreoffice-help-de
       - libreoffice-l10n-de
-      - libreoffice-kde5
       - texstudio
     state: present
 
@@ -38,8 +35,7 @@
     name:
       - evince
       - pdfgrep
-      - pdfmod
-      - pdftk
+      - pdftk-java
       - xournal
       - poppler-utils
     state: present
@@ -106,6 +102,15 @@
       - gdb
     state: present
 
+- name: Install Rust development tools
+  apt:
+    name:
+      - rust-all
+      - rust-gdb
+      - rust-lldb
+      - rust-doc
+      - rust-src
+
 - name: Remove legacy Mozilla packages
   apt:
     name: xul-ext-quotecolors
@@ -164,6 +169,7 @@
       - vlc
       - mplayer
       - smplayer
+      - mpv
       - ffmpeg
 
 - name: ensure password managers are installed