diff --git a/ansible/host_vars/dsvm.yaml b/ansible/host_vars/dsvm.yaml
index 7a36d19..5c124e1 100644
--- a/ansible/host_vars/dsvm.yaml
+++ b/ansible/host_vars/dsvm.yaml
@@ -34,6 +34,8 @@ apt_packages_development:
   - cmake
   - ninja-build
   - gfortran
+  - gcc
+  - g++
 
 apt_packages_shells:
   - bash
@@ -55,6 +57,10 @@ apt_packages_editors:
   - vim-gtk3
   - emacs
 
+apt_packages_databases:
+  - postgresql-client
+  - mariadb-client
+
 apt_packages_latex:
   - texlive-full
   - texstudio
@@ -62,7 +68,19 @@ apt_packages_latex:
 apt_packages_office:
   - libreoffice
 
-apt_packages: "{{ apt_packages_development | union(apt_packages_shells) | union(apt_packages_editors) | union(apt_packages_latex) | union(apt_packages_office) | union(apt_packages_extra) }}"
+apt_packages_browsers:
+  - firefox
+
+apt_packages: "{{ apt_packages_development | union(apt_packages_shells) | union(apt_packages_editors) | union(apt_packages_databases) | union(apt_packages_latex) | union(apt_packages_office) | union(apt_packages_browsers) | union(apt_packages_extra) }}"
+
+apt_packages_xfce:
+  - xubuntu-desktop
+  - xubuntu-core
+
+apt_packages_xrdp:
+  - xrdp
+
+apt_packages_desktop: "{{ apt_packages_xfce | union(apt_packages_xrdp) }}"
 
 snap_packages_default:
   - name: codium
diff --git a/ansible/main.yaml b/ansible/main.yaml
index 1722341..0a973a4 100644
--- a/ansible/main.yaml
+++ b/ansible/main.yaml
@@ -348,7 +348,7 @@
         - name: Install xrdp
           become: yes
           ansible.builtin.apt:
-            name: xrdp
+            name: "{{ apt_packages_xrdp }}"
             state: present
 
         - name: Set xrdp encryption level to high
@@ -411,9 +411,7 @@
         - name: Install xfce desktop
           become: yes
           ansible.builtin.apt:
-            name:
-              - xubuntu-desktop
-              - xubuntu-core
+            name: "{{ apt_packages_xfce }}"
             state: present
           async: 600
           poll: 5