diff --git a/playbooks/roles/bifrost-ironic-install/tasks/keystone_setup.yml b/playbooks/roles/bifrost-ironic-install/tasks/keystone_setup.yml
index b34020684..f7b960893 100644
--- a/playbooks/roles/bifrost-ironic-install/tasks/keystone_setup.yml
+++ b/playbooks/roles/bifrost-ironic-install/tasks/keystone_setup.yml
@@ -36,16 +36,16 @@
 
 - name: "Ensure service project is present"
   os_project:
-    name: "service"
+    name: "{{ ironic.service_catalog.project_name }}"
     state: present
     description: "Service Project"
-    domain_id: default
+    domain_id: "default"
     enabled: yes
     auth:
       auth_url: "{{ ironic.service_catalog.auth_url | default('http://127.0.0.1:5000/') }}/"
       username: "{{ keystone.bootstrap.username }}"
       password: "{{ keystone.bootstrap.password }}"
-      project_name: "admin"
+      project_name: "{{ keystone.bootstrap.project_name | default('admin') }}"
       project_domain_id: "default"
       user_domain_id: "default"
   environment:
@@ -63,7 +63,7 @@
       auth_url: "{{ ironic.service_catalog.auth_url | default('http://127.0.0.1:5000/') }}"
       username: "{{ keystone.bootstrap.username }}"
       password: "{{ keystone.bootstrap.password }}"
-      project_name: "admin"
+      project_name: "{{ keystone.bootstrap.project_name | default('admin') }}"
       project_domain_id: "default"
       user_domain_id: "default"
     wait: yes
@@ -74,13 +74,13 @@
 - name: "Associate ironic user to admin role"
   os_user_role:
     user: "{{ ironic.service_catalog.username }}"
-    role: admin
+    role: "admin"
     project: "{{ ironic.service_catalog.project_name }}"
     auth:
       auth_url: "{{ ironic.service_catalog.auth_url | default('http://127.0.0.1:5000/') }}"
       username: "{{ keystone.bootstrap.username }}"
       password: "{{ keystone.bootstrap.password }}"
-      project_name: "admin"
+      project_name: "{{ keystone.bootstrap.project_name | default('admin') }}"
       project_domain_id: "default"
       user_domain_id: "default"
     wait: yes
@@ -91,14 +91,14 @@
 - name: "Create keystone service record for ironic"
   os_keystone_service:
     state: present
-    name: ironic
-    service_type: baremetal
+    name: "ironic"
+    service_type: "baremetal"
     description: OpenStack Baremetal Service
     auth:
       auth_url: "{{ ironic.service_catalog.auth_url | default('http://127.0.0.1:5000/') }}"
       username: "{{ keystone.bootstrap.username }}"
       password: "{{ keystone.bootstrap.password }}"
-      project_name: "admin"
+      project_name: "{{ keystone.bootstrap.project_name | default('admin') }}"
       project_domain_id: "default"
       user_domain_id: "default"
     wait: yes
@@ -113,7 +113,7 @@
     --os-username "{{ keystone.bootstrap.username }}"
     --os-password "{{ keystone.bootstrap.password }}"
     --os-auth-url "{{ ironic.service_catalog.auth_url | default('http://127.0.0.1:5000/') }}"
-    --os-project-name admin
+    --os-project-name "{{ keystone.bootstrap.project_name | default('admin') }}"
     endpoint list -f json --noindent --service baremetal --interface admin
     --region "{{ keystone.bootstrap.region_name | default('RegionOne') }}"
   no_log: true
@@ -127,7 +127,7 @@
     --os-username "{{ keystone.bootstrap.username }}"
     --os-password "{{ keystone.bootstrap.password }}"
     --os-auth-url "{{ ironic.service_catalog.auth_url | default('http://127.0.0.1:5000/') }}"
-    --os-project-name admin
+    --os-project-name "{{ keystone.bootstrap.project_name | default('admin') }}"
     endpoint list -f json --noindent --service baremetal --interface public
     --region "{{ keystone.bootstrap.region_name | default('RegionOne') }}"
   no_log: true
@@ -141,7 +141,7 @@
     --os-username "{{ keystone.bootstrap.username }}"
     --os-password "{{ keystone.bootstrap.password }}"
     --os-auth-url "{{ ironic.service_catalog.auth_url | default('http://127.0.0.1:5000/') }}"
-    --os-project-name admin
+    --os-project-name "{{ keystone.bootstrap.project_name | default('admin') }}"
     endpoint list -f json --noindent --service baremetal --interface internal
     --region "{{ keystone.bootstrap.region_name | default('RegionOne') }}"
   no_log: true
@@ -155,7 +155,7 @@
     --os-username "{{ keystone.bootstrap.username }}"
     --os-password "{{ keystone.bootstrap.password }}"
     --os-auth-url "{{ ironic.service_catalog.auth_url | default('http://127.0.0.1:5000/') }}"
-    --os-project-name admin
+    --os-project-name "{{ keystone.bootstrap.project_name | default('admin') }}"
     endpoint create --region "{{ keystone.bootstrap.region_name | default('RegionOne') }}"
     baremetal admin "{{ ironic.keystone.admin_url | default('http://127.0.0.1:6385/') }}"
   no_log: true
@@ -168,7 +168,7 @@
     --os-username "{{ keystone.bootstrap.username }}"
     --os-password "{{ keystone.bootstrap.password }}"
     --os-auth-url "{{ ironic.service_catalog.auth_url | default('http://127.0.0.1:5000/') }}"
-    --os-project-name admin
+    --os-project-name "{{ keystone.bootstrap.project_name | default('admin') }}"
     endpoint create --region "{{ keystone.bootstrap.region_name | default('RegionOne') }}"
     baremetal public "{{ ironic.keystone.public_url | default('http://127.0.0.1:6385/') }}"
   no_log: true
@@ -181,7 +181,7 @@
     --os-username "{{ keystone.bootstrap.username }}"
     --os-password "{{ keystone.bootstrap.password }}"
     --os-auth-url "{{ ironic.service_catalog.auth_url | default('http://127.0.0.1:5000/') }}"
-    --os-project-name admin
+    --os-project-name "{{ keystone.bootstrap.project_name | default('admin') }}"
     endpoint create --region "{{ keystone.bootstrap.region_name | default('RegionOne') }}"
     baremetal internal "{{ ironic.keystone.internal_url | default('http://127.0.0.1:6385/') }}"
   no_log: true
@@ -195,7 +195,7 @@
       auth_url: "{{ ironic.service_catalog.auth_url | default('http://127.0.0.1:5000/') }}"
       username: "{{ keystone.bootstrap.username }}"
       password: "{{ keystone.bootstrap.password }}"
-      project_name: "admin"
+      project_name: "{{ keystone.bootstrap.project_name | default('admin') }}"
       project_domain_id: "default"
       user_domain_id: "default"
   environment:
@@ -210,7 +210,7 @@
       auth_url: "{{ ironic.service_catalog.auth_url | default('http://127.0.0.1:5000/') }}"
       username: "{{ keystone.bootstrap.username }}"
       password: "{{ keystone.bootstrap.password }}"
-      project_name: "admin"
+      project_name: "{{ keystone.bootstrap.project_name | default('admin') }}"
       project_domain_id: "default"
       user_domain_id: "default"
   environment:
@@ -222,13 +222,13 @@
     name: "baremetal"
     state: present
     description: "Baremetal Project"
-    domain_id: default
+    domain_id: "default"
     enabled: yes
     auth:
       auth_url: "{{ ironic.service_catalog.auth_url | default('http://127.0.0.1:5000/') }}"
       username: "{{ keystone.bootstrap.username }}"
       password: "{{ keystone.bootstrap.password }}"
-      project_name: "admin"
+      project_name: "{{ keystone.bootstrap.project_name | default('admin') }}"
       project_domain_id: "default"
       user_domain_id: "default"
   environment:
@@ -245,7 +245,7 @@
       auth_url: "{{ ironic.service_catalog.auth_url | default('http://127.0.0.1:5000/') }}"
       username: "{{ keystone.bootstrap.username }}"
       password: "{{ keystone.bootstrap.password }}"
-      project_name: admin
+      project_name: "{{ keystone.bootstrap.project_name | default('admin') }}"
       project_domain_id: "default"
       user_domain_id: "default"
     wait: yes
@@ -257,12 +257,12 @@
   os_user_role:
     user: "{{ ironic.keystone.default_username }}"
     role: "baremetal_admin"
-    project: baremetal
+    project: "baremetal"
     auth:
       auth_url: "{{ ironic.service_catalog.auth_url | default('http://127.0.0.1:5000/') }}"
       username: "{{ keystone.bootstrap.username }}"
       password: "{{ keystone.bootstrap.password }}"
-      project_name: admin
+      project_name: "{{ keystone.bootstrap.project_name | default('admin') }}"
       project_domain_id: "default"
       user_domain_id: "default"
     wait: yes