diff --git a/deployment/mistral/mistral-executor-container-puppet.yaml b/deployment/mistral/mistral-executor-container-puppet.yaml
index ae04ca0d98..4e318caffe 100644
--- a/deployment/mistral/mistral-executor-container-puppet.yaml
+++ b/deployment/mistral/mistral-executor-container-puppet.yaml
@@ -70,6 +70,10 @@ parameters:
     default: 5672
     description: The network port for messaging backend
     type: number
+  TripleoAdminUser:
+    default: 'tripleo-admin'
+    description: Name of user which manages the hosts
+    type: string
 
 conditions:
   undercloud_config_file_path_unset: {equals : [{get_param: UndercloudConfigFilePath}, '']}
@@ -181,6 +185,11 @@ outputs:
                         - - {get_param: UndercloudConfigFilePath}
                           - '/var/lib/mistral/undercloud.conf'
                           - 'ro'
+                - - str_replace:
+                      template:
+                        '/home/tripleo-admin:/home/tripleo-admin'
+                      params:
+                        tripleo-admin: {get_param: TripleoAdminUser}
                 - if:
                   - docker_enabled
                   - - /var/run/docker.sock:/var/run/docker.sock:rw
@@ -190,6 +199,11 @@ outputs:
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:
+        - import_role:
+            name: tripleo-create-admin
+            tasks_from: create_user.yml
+          vars:
+            tripleo_admin_user: {get_param: TripleoAdminUser}
         - name: create persistent directories
           file:
             path: "{{ item.path }}"
diff --git a/releasenotes/notes/undercloud-tripleo-admin-7043cc0b2e4bfb8a.yaml b/releasenotes/notes/undercloud-tripleo-admin-7043cc0b2e4bfb8a.yaml
new file mode 100644
index 0000000000..267a69915c
--- /dev/null
+++ b/releasenotes/notes/undercloud-tripleo-admin-7043cc0b2e4bfb8a.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    When deploying mistral-executor, create a tripleo-admin user on the
+    undercloud for running external deploy tasks with ansible.