diff --git a/playbooks/test-bifrost.yaml b/playbooks/test-bifrost.yaml
index d00fc3f4b..fda353bb9 100644
--- a/playbooks/test-bifrost.yaml
+++ b/playbooks/test-bifrost.yaml
@@ -79,7 +79,7 @@
     - { role: bifrost-create-dib-image, dib_imagename: "{{ http_boot_folder }}/ipa", build_ramdisk: false, dib_os_element: "{{ ipa_dib_os_element|default('debian') }}", dib_os_release: "jessie", dib_elements: "ironic-agent {{ ipa_extra_dib_elements | default('') }}", when: create_ipa_image | bool == true }
     - { role: bifrost-create-dib-image, dib_imagetype: "qcow2", dib_imagename: "{{deploy_image}}", dib_os_element: "debian", dib_os_release: "jessie", dib_elements: "vm enable-serial-console simple-init {{ extra_dib_elements|default('') }}", when: create_image_via_dib | bool == true and transform_boot_image | bool == false }
     - role: bifrost-keystone-client-config
-      user: "{{ ansible_env.SUDO_USER }}"
+      user: "{{ ansible_env.SUDO_USER | default(ansible_user_id) }}"
       clouds:
         bifrost:
           config_username: "{{ ironic.keystone.default_username }}"