3 files changed, 35 insertions, 13 deletions
diff --git a/roles/gnome/tasks/install-debian.yml b/roles/gnome/tasks/install-debian.yml
index c9e68552..55ed8836 100644
--- a/roles/gnome/tasks/install-debian.yml
+++ b/roles/gnome/tasks/install-debian.yml
@@ -4,18 +4,24 @@
   ansible.builtin.apt:
     name: "{{ gnome_packages }}"
     state: "present"
-    install_recommends: true
+    install_recommends: false
   tags:
+    # NOTE: the gnome-core packages resinstalls the avahi packages
+    # Disabling the idemopotence test to prevent always reporting changed
     - molecule-idempotence-notest
 
-- name: "Remove avahi-daemon installed by GNOME"
+- name: "Remove avahi packages installed by GNOME to prevent conflict with MutlicastDNS"
   become: true
   ansible.builtin.apt:
-    name: "avahi-daemon"
+    name:
+      - "avahi-daemon"
+      - "avahi-utils"
     state: "absent"
     autoremove: true
     purge: true
   tags:
+    # NOTE: the gnome-core packages resinstalls the avahi packages
+    # Disabling the idemopotence test to prevent always reporting changed
     - molecule-idempotence-notest
 
 - name: "Enable GDM display manager"
diff --git a/roles/gnome/vars/ubuntu.yml b/roles/gnome/vars/ubuntu.yml
index 396a3e90..92552d28 100644
--- a/roles/gnome/vars/ubuntu.yml
+++ b/roles/gnome/vars/ubuntu.yml
@@ -1,7 +1,33 @@
 ---
 gnome_packages:
+  # Core GNOME meta-package
   - "vanilla-gnome-desktop"
   - "vanilla-gnome-default-settings"
   - "gdm3"
   - "gnome-software"
   - "gnome-tweaks"
+
+  # Web browser
+  - "firefox"
+
+  # Office suite
+  - "libreoffice-calc"
+  - "libreoffice-writer"
+  - "libreoffice-impress"
+  - "libreoffice-gnome"
+
+  # Media applications
+  - "rhythmbox"
+  - "totem"
+  - "cheese"
+
+  # Utilities
+  - "file-roller"
+  - "gnome-calculator"
+  - "gnome-calendar"
+  - "gnome-characters"
+  - "simple-scan"
+  - "baobab"
+
+  # Accessibility
+  - "orca"
diff --git a/roles/grafana/tasks/install-debian.yml b/roles/grafana/tasks/install-debian.yml
index f641d15f..a2ca371b 100644
--- a/roles/grafana/tasks/install-debian.yml
+++ b/roles/grafana/tasks/install-debian.yml
@@ -11,11 +11,6 @@
     url: "https://apt.grafana.com/gpg.key"
     dest: "/etc/apt/trusted.gpg.d/grafana.asc"
     mode: "0644"
-  tags:
-    # Ubuntu containers experience DNS failures during molecule idempotence runs
-    # causing get_url to fail even when files exist. Skip this task during idempotence
-    # since the download functionality is already verified during the converge phase.
-    - molecule-idempotence-notest
 
 - name: "Add Grafana repository"
   become: true
@@ -29,11 +24,6 @@
   ansible.builtin.apt:
     update_cache: true
   changed_when: false
-  tags:
-    # Ubuntu containers experience DNS failures during molecule idempotence runs
-    # causing get_url to fail even when files exist. Skip this task during idempotence
-    # since the download functionality is already verified during the converge phase.
-    - molecule-idempotence-notest
 
 - name: "Install grafana"
   become: true