diff --git a/inventory/group_vars/bastion b/inventory/group_vars/bastion
index aad8e75c8a..65297a3643 100644
--- a/inventory/group_vars/bastion
+++ b/inventory/group_vars/bastion
@@ -23,7 +23,7 @@ custom_rules: [
 
 # TODO - remove modularity-wg membership here once it is not longer needed:
 # https://fedorahosted.org/fedora-infrastructure/ticket/5363
-fas_client_groups: sysadmin-ask,sysadmin-web,sysadmin-main,sysadmin-cvs,sysadmin-build,sysadmin-noc,sysadmin-releng,sysadmin-dba,sysadmin-hosted,sysadmin-tools,sysadmin-spin,sysadmin-cloud,fi-apprentice,sysadmin-badges,sysadmin-troubleshoot,sysadmin-qa,sysadmin-centos,sysadmin-ppc,sysadmin-koschei,sysadmin-secondary,sysadmin-fedimg,sysadmin-veteran,sysadmin-mbs,modularity-wg,pungi-devel
+fas_client_groups: sysadmin-ask,sysadmin-atomic,sysadmin-web,sysadmin-main,sysadmin-cvs,sysadmin-build,sysadmin-noc,sysadmin-releng,sysadmin-dba,sysadmin-hosted,sysadmin-tools,sysadmin-spin,sysadmin-cloud,fi-apprentice,sysadmin-badges,sysadmin-troubleshoot,sysadmin-qa,sysadmin-centos,sysadmin-ppc,sysadmin-koschei,sysadmin-secondary,sysadmin-fedimg,sysadmin-veteran,sysadmin-mbs,modularity-wg,pungi-devel
 
 #
 # This is a postfix gateway. This will pick up gateway postfix config in base
diff --git a/inventory/group_vars/batcave b/inventory/group_vars/batcave
index a32bcf9d17..74d96539b2 100644
--- a/inventory/group_vars/batcave
+++ b/inventory/group_vars/batcave
@@ -8,7 +8,7 @@ tcp_ports: [ 80, 443 ]
 # Neeed for rsync from log01 for logs.
 custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT' ]
 
-fas_client_groups: sysadmin-ask,sysadmin-build,sysadmin-cvs,sysadmin-main,sysadmin-web,sysadmin-noc,sysadmin-hosted,sysadmin-releng,sysadmin-qa,sysadmin-tools,sysadmin-cloud,sysadmin-bot,sysadmin-centos,sysadmin-koschei,sysadmin-datanommer,sysadmin-fedimg,fi-apprentice,sysadmin-regcfp,sysadmin-badges,sysadmin-mbs,sysadmin-veteran
+fas_client_groups: sysadmin-ask,sysadmin-atomic,sysadmin-build,sysadmin-cvs,sysadmin-main,sysadmin-web,sysadmin-noc,sysadmin-hosted,sysadmin-releng,sysadmin-qa,sysadmin-tools,sysadmin-cloud,sysadmin-bot,sysadmin-centos,sysadmin-koschei,sysadmin-datanommer,sysadmin-fedimg,fi-apprentice,sysadmin-regcfp,sysadmin-badges,sysadmin-mbs,sysadmin-veteran
 
 ansible_base: /srv/web/infra
 freezes: false
diff --git a/playbooks/manual/get-system-packages.yml b/playbooks/manual/get-system-packages.yml
index f0388ef0cb..fae2967e4a 100644
--- a/playbooks/manual/get-system-packages.yml
+++ b/playbooks/manual/get-system-packages.yml
@@ -9,31 +9,11 @@
 
   tasks:
 
-  - name: yum_command 
-    yum: list=installed
-    register: yum_packages
-    when: ansible_distribution == "RedHat" and ansible_distribution_major_version|int <= 7
+  - name: RPM_output
+    shell: '/usr/bin/rpm -qa'
+    changed_when: False
+    register: rpmoutput
 
-  - name: dnf_command
-    dnf: list=installed
-    register: dnf_packages
-    when: ansible_distribution == "Fedora" and ansible_distribution_major_version|int > 21
+  - debug: msg="{{ inventory_hostname}} {{ rpmoutput.results }}"
+    when: rpmoutput is defined and rpmoutput.results|length > 0
 
-  - name: dnf_command
-    dnf: list=installed
-    register: dnf_packages
-    when: ansible_distribution == "RedHat" and ansible_distribution_major_version|int > 8
-
-#  - debug: msg="{{ inventory_hostname}} {{ yum_packages.results }}"
-#    when: yum_packages is defined and yum_packages.results|length > 0
-
-  - debug: msg="{{ item.envra }}"
-    with_items: "{{ yum_packages.results }}"
-    when: yum_packages is defined and yum_packages.results|length > 0
-
-  - debug: msg="{{ item }}"
-    with_items: "{{ dnf_packages.results }}"
-    when: dnf_packages is defined and dnf_packages.results|length > 0
-
-#
-#