diff --git a/service/files/defaults.yaml b/service/files/defaults.yaml
index ad9c4fc..b06776f 100644
--- a/service/files/defaults.yaml
+++ b/service/files/defaults.yaml
@@ -7,7 +7,7 @@ configs:
     debug: false
 
     automated_clean: false
-    enabled_drivers: "fake,pxe_ssh_ansible,pxe_ipmitool_ansible"
+    enabled_drivers: "fake,agent_ssh,agent_ipmitool"
 
     ipxe:
       external_port: 6388
diff --git a/service/ironic-api.yaml b/service/ironic-api.yaml
index f36ebc6..bd5fa42 100644
--- a/service/ironic-api.yaml
+++ b/service/ironic-api.yaml
@@ -15,10 +15,10 @@ service:
       pre:
         - name: ironic-db-create
           type: single
-          command: mysql -v -u root -p{{ db.root_password }} -h {{ address("database") }} -e "create database `{{ ironic.db.name }}`;
+          command: mysql -v -u root -p{{ db.root_password }} -h {{ address("database") }} -e "create database {{ ironic.db.name }};
                    create user '{{ ironic.db.username }}'@'%' identified by '{{ ironic.db.password }}'
                    {% if db.tls.enabled %} require ssl {% endif %};
-                   grant all privileges on `{{ ironic.db.name }}`.* to '{{ ironic.db.username }}'@'%' identified by '{{ ironic.db.password }}'
+                   grant all privileges on {{ ironic.db.name }}.* to '{{ ironic.db.username }}'@'%' identified by '{{ ironic.db.password }}'
                    {% if db.tls.enabled %} require ssl {% endif %};"
           dependencies:
             - database
diff --git a/service/ironic-conductor.yaml b/service/ironic-conductor.yaml
index 1deb695..2b8e754 100644
--- a/service/ironic-conductor.yaml
+++ b/service/ironic-conductor.yaml
@@ -20,9 +20,10 @@ service:
           dependencies:
             - radosgw
           type: single
-          command: swift --insecure
+          command: swift --insecure --auth-version 3
                    --os-auth-url {{ address('keystone', keystone.public_port, with_scheme=True) }}/v3
-                   --os-project-name service --os-project-domain-name default --os-user-domain-name default
+                   --os-project-name {{ service_account.project }} --os-project-domain-name {{ service_account.domain }}
+                   --os-user-domain-name {{ service_account.domain }}
                    --os-username {{ glance.user }} --os-password {{ glance.password }} --os-endpoint-type internalURL
                    post -m "Temp-URL-Key:{{ ironic.swift.temp_url_key }}"
       daemon: