diff --git a/tasks/secure-installation.yml b/tasks/secure-installation.yml
index a3a4f90..f02af77 100644
--- a/tasks/secure-installation.yml
+++ b/tasks/secure-installation.yml
@@ -1,27 +1,37 @@
 ---
+- name: Get list of hosts for the root user.
+  command: mysql -NBe 'SELECT Host FROM mysql.user WHERE User = "root" ORDER BY (Host="localhost") ASC'
+  register: mysql_root_hosts
+  changed_when: false
+
 # 'localhost' needs to be last for idempotency.
 - name: Update MySQL root password for localhost root account.
   mysql_user:
     name: "root"
     host: "{{ item }}"
     password: "{{ mysql_root_password }}"
-  with_items:
-    - "{{ ansible_hostname }}"
-    - 127.0.0.1
-    - ::1
-    - localhost
+  with_items: mysql_root_hosts.stdout_lines
 
 # Has to be after the root password assignment, for idempotency.
 - name: Copy .my.cnf file with root password credentials.
   template:
-    src: "python-my.cnf.j2"
+    src: "user-my.cnf.j2"
     dest: "{{ mysql_user_home }}/.my.cnf"
     owner: root
     group: root
     mode: 0600
 
-- name: Remove anonymous MySQL user.
-  mysql_user: "name='' state=absent"
+- name: Get list of hosts for the anonymous user.
+  command: mysql -NBe 'SELECT Host FROM mysql.user WHERE User = ""'
+  register: mysql_anonymous_hosts
+  changed_when: false
+
+- name: Remove anonymous MySQL users.
+  mysql_user:
+     name: ""
+     host: "{{ item }}"
+     state: absent
+  with_items: mysql_anonymous_hosts.stdout_lines
 
 - name: Remove MySQL test database.
   mysql_db: "name='test' state=absent"
\ No newline at end of file
diff --git a/templates/python-my.cnf.j2 b/templates/user-my.cnf.j2
similarity index 100%
rename from templates/python-my.cnf.j2
rename to templates/user-my.cnf.j2