diff --git a/roles/collectd/tasks/main.yml b/roles/collectd/tasks/main.yml
index 6a26256114978966c7b3909f612ec36639e1cb2c..fccbe6af077098d463721d352ab9d20e878f3079 100644
--- a/roles/collectd/tasks/main.yml
+++ b/roles/collectd/tasks/main.yml
@@ -1,6 +1,16 @@
 ---
-- name: install collectd
-  yum: name=collectd state=installed
+- name: install collectd - CentOS
+  yum: name=collectd state=installed enablerepo=epel
+  when:
+   - '"CentOS" in ansible_distribution'
+  become: true
+  become_user: root
+
+- name: install collectd - RHEL7
+  yum: name=collectd state=installed enablerepo="Monash_University_EPEL7_EPEL_7_-_x86_64"
+  when:
+   - '"DGX" in ansible_product_name'
+   - '"RedHat" in ansible_distribution'
   become: true
   become_user: root
 
diff --git a/roles/extra_packages/tasks/main.yml b/roles/extra_packages/tasks/main.yml
index 3c9c991dc675a6d1387643c795c7f28612459fcd..46ce40a581ae7baf34981217f2313fb5d506841a 100644
--- a/roles/extra_packages/tasks/main.yml
+++ b/roles/extra_packages/tasks/main.yml
@@ -6,12 +6,33 @@
 - name: "Clear yum cache"
   command: yum clean all
   become: true
+  become_user: root
   when: ansible_os_family == 'RedHat'
 
 - name: "Clear yum pending transactions"
   command: yum-complete-transaction --cleanup-only
   become: true
+  become_user: root 
   when: ansible_os_family == 'RedHat'
+
+- name: "Install extra packages"
+  yum: "name={{ item }} exclude={{ excludes|join(',') }} update_cache=yes state=present"
+  with_items: "{{ extra_packages }}"
+  become: true
+  become_user: root
+  when:
+   - '"CentOS" in ansible_distribution'
+  register: result
+
+- name: "Install extra packages"
+  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
+  become_user: root
+  when: 
+   - '"DGX" in ansible_product_name'
+   - '"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"
diff --git a/roles/lmod/tasks/main.yml b/roles/lmod/tasks/main.yml
index 951a1cdcb93f00c291a6a203820587dc7939369b..9e2ac4af909db08388e570ca586bec83e0889118 100644
--- a/roles/lmod/tasks/main.yml
+++ b/roles/lmod/tasks/main.yml
@@ -12,7 +12,24 @@
     - gcc
     - lua-devel
   become: true
-  when: ansible_os_family == 'RedHat'
+  when:
+   - '"CentOS" in ansible_distribution'
+
+- name: install lua RHEL7
+  yum: name={{ item }} state=installed update_cache=yes enablerepo="Monash_University_EPEL7_EPEL_7_-_x86_64"
+  with_items:
+    - lua
+    - lua-filesystem
+    - lua-posix
+    - tcl
+    - rsync
+    - gcc
+    - lua-devel
+  when:
+   - '"DGX" in ansible_product_name'
+   - '"RedHat" in ansible_distribution'
+  become: true
+
 
 - name: install lua debian
   apt: name={{ item }} state=installed
@@ -36,7 +53,7 @@
 - name: Download LMOD
   get_url:
     url=http://consistency0/src/Lmod-{{ lmod_version }}.tar.bz2
-    dest={{source_dir}}/Lmod-{{ lmod_version }}.tar.bz2
+    dest={{ source_dir }}/Lmod-{{ lmod_version }}.tar.bz2
     mode=0444
   when: not lmodstat.stat.exists
 
@@ -45,7 +62,7 @@
     src={{ source_dir }}/Lmod-{{ lmod_version }}.tar.bz2
     dest={{ source_dir }}
     copy=no
-    creates={{source_dir}}/Lmod-{{ lmod_version }}/README
+    creates={{ source_dir }}/Lmod-{{ lmod_version }}/README
   when: not lmodstat.stat.exists
 
 - name: Compile and install Lmod
diff --git a/roles/vncserver/vars/RedHat_x86_64.yml b/roles/vncserver/vars/RedHat_x86_64.yml
new file mode 100644
index 0000000000000000000000000000000000000000..0880aa2776c71ada625cd7f9b36dd9e5c57cf042
--- /dev/null
+++ b/roles/vncserver/vars/RedHat_x86_64.yml
@@ -0,0 +1,20 @@
+---
+ system_packages:
+   - tigervnc-server
+   - libXcomposite
+   - libXdamage
+   - mesa-libEGL
+   - mesa-libgbm
+   - harfbuzz
+   - mesa-libglapi
+   - graphite2
+   - xterm
+   - libpng
+   - xorg-x11-fonts-100dpi
+   - xorg-x11-fonts-75dpi
+   - xorg-x11-fonts-misc
+
+ system_group_packages:
+   - "mate-desktop-environment"
+   - "graphical-server-environment"
+