2 files changed, 10 insertions, 9 deletions
diff --git a/roles/devel/tasks/dnf.yml b/roles/devel/tasks/dnf.yml
index 350108a..bd6e452 100644
--- a/roles/devel/tasks/dnf.yml
+++ b/roles/devel/tasks/dnf.yml
@@ -1,5 +1,6 @@
 - name: Install development package groups
-  dnf: name={{item}} state=present
-  with_items: 
-    - "@Development and Creative Workstation"
-    
+  dnf: 
+    state: present
+    name: 
+        - "@Development Tools"
+        - "@RPM Development Tools"
diff --git a/roles/devel/tasks/main.yml b/roles/devel/tasks/main.yml
index d42dd31..7d08a15 100644
--- a/roles/devel/tasks/main.yml
+++ b/roles/devel/tasks/main.yml
@@ -8,12 +8,12 @@
         - "{{ ansible_distribution|lower }}.yml"
         - "{{ ansible_os_family|lower }}.yml"
 
-- include_tasks: dnf.yml
-  when:  ansible_distribution | lower == 'fedora'
-
 - include_tasks: yum.yml
-  when: (ansible_os_family | lower == 'redhat') and (ansible_distribution | lower != 'fedora')
+  when: ansible_pkg_mgr == 'yum' 
+  
+- include_tasks: dnf.yml
+  when: ansible_pkg_mgr == 'dnf'
 
 - name: Install various development packages
   package: name={{item}} state=present
-  with_items: "{{ common_packages | union(packages | default([])) }}"
+  with_items: "{{ common_packages | union ( extra_packages | default([]) ) | union(packages | default([])) }}"