diff --git a/roles/mail/tasks/backend.yml b/roles/mail/tasks/backend.yml
index a7646e10a06f39ccf8b545379a8a27535927be40..7ae1522fa075ad3619541038fd6f83ea4f890ab5 100644
--- a/roles/mail/tasks/backend.yml
+++ b/roles/mail/tasks/backend.yml
@@ -220,11 +220,14 @@
 - name: Create Spamassassin MySQL user
   mysql_user:
     name: spamassassin
-    host: "%"
+    host: "{{ item }}"
     password: "{{ spamassassin_db_password }}"
     login_unix_socket: "/var/run/mariadb-mail/server.sock"
     priv: "ai_spam.*:ALL"
     state: present
+  loop:
+    - localhost
+    - "%"
 
 - name: Create Spamassassin MySQL database
   mysql_db:
@@ -252,11 +255,14 @@
 - name: Create Roundcube MySQL user
   mysql_user:
     name: roundcube
-    host: "%"
+    host: "{{ item }}"
     password: "{{ roundcube_db_password }}"
     login_unix_socket: "/var/run/mariadb-mail/server.sock"
     priv: "ai_roundcube.*:ALL"
     state: present
+  loop:
+    - localhost
+    - "%"
 
 - name: Create Roundcube MySQL database
   mysql_db:
diff --git a/roles/noblogs/tasks/main.yml b/roles/noblogs/tasks/main.yml
index 2a8ea6b11a06b525941b8a92a33f2e99e1f9e46f..313f5c135f63213b5e39d812b11cb984a76d5001 100644
--- a/roles/noblogs/tasks/main.yml
+++ b/roles/noblogs/tasks/main.yml
@@ -66,11 +66,14 @@
 - name: Create noblogs MySQL user
   mysql_user:
     name: noblogs
-    host: "%"
+    host: "{{ item }}"
     password: "{{ noblogs_db_user_password }}"
     login_unix_socket: "/var/run/mariadb-noblogs/server.sock"
     priv: "*.*:ALL"
     state: present
+  loop:
+    - localhost
+    - "%"
 
 # If the database directory for the 'noblogs' db does not exist,
 # initialize the db. Only run on the master host.