diff --git a/roles/debian/user_ansible/defaults/main.yml b/roles/debian/user_ansible/defaults/main.yml
index a0b64b3de..c3cb758e8 100644
--- a/roles/debian/user_ansible/defaults/main.yml
+++ b/roles/debian/user_ansible/defaults/main.yml
@@ -11,7 +11,7 @@ user_ansible:
   # gid: 999
   # Local username of the deploy user.
   utility_host: "localhost"
-  utility_username: ""
+  utility_username: "{{ _user_ansible_username }}"
   sudoer:
     false
   # List of additional groups to add the user to.
diff --git a/roles/debian/user_deploy/defaults/main.yml b/roles/debian/user_deploy/defaults/main.yml
index 084fbb153..711f53c89 100644
--- a/roles/debian/user_deploy/defaults/main.yml
+++ b/roles/debian/user_deploy/defaults/main.yml
@@ -13,7 +13,7 @@ user_deploy:
   # gid: 989
   # Local username of the deploy user.
   utility_host: "localhost"
-  utility_username: "{% if is_local is defined and is_local %}ce-dev{% else %}deploy{% endif %}"
+  utility_username: "{{ _user_deploy_username }}"
   sudoer: false
   # List of additional groups to add the user to.
   groups:
diff --git a/roles/debian/user_provision/defaults/main.yml b/roles/debian/user_provision/defaults/main.yml
index a7a5a49d2..a1c8799cf 100644
--- a/roles/debian/user_provision/defaults/main.yml
+++ b/roles/debian/user_provision/defaults/main.yml
@@ -12,7 +12,7 @@ user_provision:
   # gid: 988
   # Local username of the system user.
   utility_host: "localhost"
-  utility_username: "{% if is_local is defined and is_local %}ce-dev{% else %}controller{% endif %}"
+  utility_username: "{{ _user_provision_username }}"
   sudoer: true
   groups: []
   ssh_keys: []