diff --git a/roles/collectd/tasks/main.yml b/roles/collectd/tasks/main.yml
index d630edef29522e5d7e4c907869a2350c6773de38..f0b0de55947ac0cc3c9723c5c1dbc1d86745a6db 100644
--- a/roles/collectd/tasks/main.yml
+++ b/roles/collectd/tasks/main.yml
@@ -7,7 +7,7 @@
   become_user: root
 
 - name: install collectd - RHEL7
-  yum: name=collectd state=present enablerepo="Monash_University_EPEL7_EPEL_7_-_x86_64"
+  yum: name=collectd state=present enablerepo="org_monash_uni_EPEL_7_EPEL_7_-_x86_64"
   when:
    - '"DGX" in ansible_product_name'
    - '"RedHat" in ansible_distribution'
diff --git a/roles/extra_packages/tasks/main.yml b/roles/extra_packages/tasks/main.yml
index a4ea8e844f7f9cb9ede0bd18669685fc00299ba3..491d4e97919fd704768244eef881b3c7abb14f25 100644
--- a/roles/extra_packages/tasks/main.yml
+++ b/roles/extra_packages/tasks/main.yml
@@ -36,7 +36,7 @@
     exclude: "{{ excludes|join(',') }}"
     update_cache: yes
     state: present
-    enablerepo: Monash_University_EPEL7_EPEL_7_-_x86_64
+    enablerepo: "org_monash_uni_EPEL_7_EPEL_7_-_x86_64"
   become: true
   become_user: root
   when:
diff --git a/roles/lmod/tasks/main.yml b/roles/lmod/tasks/main.yml
index 3bb127b247a0e0b05c91b1b16af35f13fbdd4bc6..1f17c9b5fc6d3550139d0c118284d7c74581bad6 100644
--- a/roles/lmod/tasks/main.yml
+++ b/roles/lmod/tasks/main.yml
@@ -19,7 +19,7 @@
   yum:
     state: present
     update_cache: yes
-    enablerepo: "Monash_University_EPEL7_EPEL_7_-_x86_64"
+    enablerepo: "org_monash_uni_EPEL_7_EPEL_7_-_x86_64"
     name:
       - lua
       - lua-filesystem
diff --git a/roles/mysql/tasks/CentOS_7_mysql_server.yml b/roles/mysql/tasks/CentOS_7_mysql_server.yml
index 38d4dad291e8f2e5056d85f773f1c961533b3dfa..2ca9705694405b63543ae9164ad2c00bd045be91 100644
--- a/roles/mysql/tasks/CentOS_7_mysql_server.yml
+++ b/roles/mysql/tasks/CentOS_7_mysql_server.yml
@@ -56,8 +56,8 @@
   mysql_user: name={{ mysql_user_name }} host={{ hostvars[item].ansible_fqdn }} password={{ mysql_user_password }} login_user=root login_password={{ mysql_root_password }} priv={{ mysql_user_db_name }}.*:ALL,GRANT state=present
   with_items: "{{ mysql_user_hosts_group }}"
   when: mysql_user_hosts_group is defined
-  
+
 - name: "Giving priviliges to user with shortname"
-  mysql_user: name={{ mysql_user_name }} host={{ inventory_hostname }} password={{ mysql_user_password }} login_user=root login_password={{ mysql_root_password }} priv={{ mysql_user_db_name }}.*:ALL,GRANT state=present
+  mysql_user: name={{ mysql_user_name }} host={{ item }} password={{ mysql_user_password }} login_user=root login_password={{ mysql_root_password }} priv={{ mysql_user_db_name }}.*:ALL,GRANT state=present
   with_items: "{{ mysql_user_hosts_group }}"
-  when: mysql_user_hosts_group is defined  
+  when: mysql_user_hosts_group is defined
diff --git a/roles/mysql/tasks/Ubuntu_18_mysql_server.yml b/roles/mysql/tasks/Ubuntu_18_mysql_server.yml
index e573a9187a9ffc76168341b23c37e04675d7c54b..ca39b70331abbe55a35b8c9439db7eb01fbb83bd 100644
--- a/roles/mysql/tasks/Ubuntu_18_mysql_server.yml
+++ b/roles/mysql/tasks/Ubuntu_18_mysql_server.yml
@@ -51,4 +51,4 @@
   with_items: "{{ mysql_user_hosts_group }}"
   when: mysql_user_hosts_group is defined
   become: true
-  become_user: root
\ No newline at end of file
+  become_user: root