diff --git a/CICD/plays/computenodes.yml b/CICD/plays/computenodes.yml
index 8dd5617c05bf15fd8e1d5049ef1d1db6a2fd1fd8..1679424e3e8bd1055b47a07e3426d2780f2cf675 100644
--- a/CICD/plays/computenodes.yml
+++ b/CICD/plays/computenodes.yml
@@ -15,6 +15,7 @@
   - include_vars: vars/filesystems.yml 
   - include_vars: vars/slurm.yml 
   - include_vars: vars/vars.yml 
+  - include_vars: vars/c7packages.yml 
   - { name: set use shared state, set_fact: usesharedstatedir=False }
   tags: [ always ]
 
@@ -90,7 +91,7 @@
   - { role: slurm-start, start_slurmd: True, tags: [ slurm, slurm-start ] }
   - { role: vncserver, tags: [ other ] }
   - { role: jasons_ssh_ca, tags: [ other ] }
-  #- { role: extra_packages, tags: [ other, extra_packages ] } # commented because it takes forever! good enough if this gets tested on clusterbuild
+  - { role: extra_packages, tags: [ other, extra_packages ] } # commented because it takes forever! good enough if this gets tested on clusterbuild
   - { role: telegraf, telegraf_install_rpm_url: 'http://consistency0/src/telegraf-1.12.6-1.x86_64.rpm', tags: [ monitoring,SiteSpecific ] }
 
 - hosts: 'VisNodes'
diff --git a/roles/extra_packages/tasks/main.yml b/roles/extra_packages/tasks/main.yml
index 39d8e165d58fc2c119e32cdb6423296b737f0d2f..5811a672e5e101498f3323257d665a2da33f2ae4 100644
--- a/roles/extra_packages/tasks/main.yml
+++ b/roles/extra_packages/tasks/main.yml
@@ -19,16 +19,19 @@
   when: ansible_os_family == 'RedHat'
   changed_when: '"No unfinished transactions left." not in yumCompleteTransactioncall.stdout'
 
-- name: "Install extra packages"
-  yum: "name={{ item }} exclude={{ excludes|join(',') }} update_cache=yes state=present"
-  with_items: "{{ extra_packages }}"
+- name: "Install extra packages  Centos"
+  yum: 
+    name: "{{ extra_packages }}"
+    exclude: "{{ excludes|join(',') }}"
+    update_cache: yes
+    state: present
   become: true
   become_user: root
   when:
    - '"CentOS" in ansible_distribution'
   register: result
 
-- name: "Install extra packages"
+- name: "Install extra packages Redhat"
   yum: "name={{ item }} exclude={{ excludes|join(',') }} update_cache=yes state=present enablerepo='Monash_University_EPEL7_EPEL_7_-_x86_64'"
   with_items: "{{ extra_packages }}"
   become: true
@@ -38,18 +41,12 @@
    - '"RedHat" in ansible_distribution'
   register: result
  
-- name: "Install extra packages with the epel repo enabled"
-  yum: "name={{ item }} exclude={{ excludes|join(',') }} update_cache=yes state=present enablerepo=epel"
-  with_items: "{{ extra_packages }}"
-  become: true
-  become_user: root
-  when:
-   - '"CentOS" in ansible_distribution'
-  register: result
-
 - name: "Install extra packages from epel only"
-  yum: "name={{ item }}  update_cache=yes state=present enablerepo=epel" # exclude={{ excludes|join(',') }}
-  with_items: "{{ extra_packages_epel }}"
+  yum: 
+    name: "{{ extra_packages_epel }}"
+    update_cache: yes
+    state: present
+    enablerepo: epel" # exclude={{ excludes|join(',') }}
   become: true
   become_user: root
   when: