diff --git a/ansible/action_plugins/merge_configs.py b/ansible/action_plugins/merge_configs.py
index dd4e382dbed8fe3ff21eca38018a009b2dec7dd7..7218a2ac9970be40ba533b0b5595701840af1830 100644
--- a/ansible/action_plugins/merge_configs.py
+++ b/ansible/action_plugins/merge_configs.py
@@ -49,7 +49,7 @@ class ActionModule(action.ActionBase):
         if not tmp and len(make_tmp_path_args) == 1:
             tmp = self._make_tmp_path()
         if not tmp and len(make_tmp_path_args) == 2:
-            remote_user = (task_vars.get('ansible_ssh_user')
+            remote_user = (task_vars.get('ansible_user')
                            or self._play_context.remote_user)
             tmp = self._make_tmp_path(remote_user)
 
diff --git a/ansible/action_plugins/merge_yaml.py b/ansible/action_plugins/merge_yaml.py
index 76410833b3256a5a534f5912549cb28e9178371f..34ba7fb8db90f5adeb4b1c32654057d83794ef9e 100755
--- a/ansible/action_plugins/merge_yaml.py
+++ b/ansible/action_plugins/merge_yaml.py
@@ -57,7 +57,7 @@ class ActionModule(action.ActionBase):
         if not tmp and len(make_tmp_path_args) == 1:
             tmp = self._make_tmp_path()
         if not tmp and len(make_tmp_path_args) == 2:
-            remote_user = (task_vars.get('ansible_ssh_user')
+            remote_user = (task_vars.get('ansible_user')
                            or self._play_context.remote_user)
             tmp = self._make_tmp_path(remote_user)
         # save template args.
diff --git a/ansible/inventory/multinode b/ansible/inventory/multinode
index c50eea2babf53aeae42a41e9852aed94d4670ee1..150af0e93124094083827fd3fc346ff19e8aec00 100644
--- a/ansible/inventory/multinode
+++ b/ansible/inventory/multinode
@@ -7,7 +7,7 @@ control02
 control03
 
 # The above can also be specified as follows:
-#control[01:03]     ansible_ssh_user=kolla
+#control[01:03]     ansible_user=kolla
 
 # The network nodes are where your l3-agent and loadbalancers will run
 # This can be the same as a host in the control group