diff --git a/roles/el/tasks/packages-cli.yml b/roles/el/tasks/packages-cli.yml
index 64f44cc..d53a02c 100644
--- a/roles/el/tasks/packages-cli.yml
+++ b/roles/el/tasks/packages-cli.yml
@@ -32,9 +32,7 @@
     state: present
   vars:
     packages:
-      - "@container-tools"
       - "@development"
-      - aspell-en
       - bc
       - bind-utils
       - clang
@@ -44,9 +42,19 @@
       - mc
       - nmap
       - openssh-server
-      - python38
-      - python38-psutil
       - sqlite
       - sudo
       - tmux
       - vim-enhanced
+- name: Install CLI packages (EL 8)
+  become: true
+  ansible.builtin.dnf:
+    name: '{{ packages }}'
+    state: present
+  vars:
+    packages:
+      - "@container-tools"
+      - aspell-en
+      - python38
+      - python38-psutil
+  when: ansible_distribution_major_version == 8
diff --git a/roles/el/tasks/packages-gui.yml b/roles/el/tasks/packages-gui.yml
index 2a9b55e..5b79d9a 100644
--- a/roles/el/tasks/packages-gui.yml
+++ b/roles/el/tasks/packages-gui.yml
@@ -23,6 +23,10 @@
       - git-gui
       - liberation-fonts
       - vim-X11
+- name: Check for Gnome Shell
+  ansible.builtin.stat:
+    path: /usr/bin/gnome-shell
+  register: gnome_shell
 - name: Install Gnome packages (EL 8)
   become: true
   ansible.builtin.dnf: