diff --git a/components/13-ironic/README.md b/components/13-ironic/README.md
index d793c36b..c8527b05 100644
--- a/components/13-ironic/README.md
+++ b/components/13-ironic/README.md
@@ -36,6 +36,14 @@ Secrets Reference:
   executed by the rabbitmq-queues component. The name stems from the RabbitMQ
   cluster from the rabbitmq-cluster component. `${CLUSTER_NAME}-default-user`
 
+### Create the rabbitmq and mariadb instances
+
+```bash
+kubectl -n openstack apply -k components/13-ironic
+```
+
+### Apply the ironic helm template with our custom aio-values.yaml
+
 ```bash
 helm --namespace openstack template \
     ironic \
@@ -45,12 +53,13 @@ helm --namespace openstack template \
     --set endpoints.oslo_db.auth.admin.password="$(kubectl --namespace openstack get secret mariadb -o jsonpath='{.data.root-password}' | base64 -d)" \
     --set endpoints.oslo_db.auth.keystone.password="$(kubectl --namespace openstack get secret keystone-db-password -o jsonpath='{.data.password}' | base64 -d)" \
     --set endpoints.oslo_messaging.auth.admin.password="$(kubectl --namespace openstack get secret openstack-default-user -o jsonpath='{.data.password}' | base64 -d)" \
+    --set endpoints.oslo_messaging.hosts.default="openstack" \
     --set endpoints.oslo_messaging.auth.keystone.password="$(kubectl --namespace openstack get secret keystone-rabbitmq-password -o jsonpath='{.data.password}' | base64 -d)" \
     --post-renderer $(git rev-parse --show-toplevel)/scripts/openstack-helm-sealed-secrets.sh \
     | kubectl -n openstack apply -f -
 ```
 
-At this point Keystone will go through some initialization and start uo.
+At this point Ironic will go through some initialization and start up.
 
 ## Validating Keystone
 
diff --git a/components/13-ironic/aio-values.yaml b/components/13-ironic/aio-values.yaml
index b2d2204d..53c1697e 100644
--- a/components/13-ironic/aio-values.yaml
+++ b/components/13-ironic/aio-values.yaml
@@ -45,6 +45,15 @@ conf:
   ironic:
     ironic_conductor:
       automated_clean: false
+    conductor:
+      automated_clean: false
+    dhcp:
+      dhcp_provider: none
+  logging:
+    logger_root:
+      level: DEBUG
+    logger_ironic:
+      level: DEBUG
 
 endpoints:
   identity:
@@ -62,6 +71,8 @@ network:
     external_policy_local: false
     node_port:
       enabled: false
+  pxe:
+    device: ens1f0
 
 dependencies:
   dynamic:
diff --git a/components/13-ironic/ironic-mariadb-db.yaml b/components/13-ironic/ironic-mariadb-db.yaml
index be0499ae..92c4e7d6 100644
--- a/components/13-ironic/ironic-mariadb-db.yaml
+++ b/components/13-ironic/ironic-mariadb-db.yaml
@@ -2,7 +2,7 @@
 apiVersion: mariadb.mmontes.io/v1alpha1
 kind: Database
 metadata:
-  name: keystone
+  name: ironic
   namespace: openstack
 spec:
   # If you want the database to be created with a different name than the resource name
@@ -17,7 +17,7 @@ spec:
 apiVersion: mariadb.mmontes.io/v1alpha1
 kind: User
 metadata:
-  name: keystone
+  name: ironic
   namespace: openstack
 spec:
   # If you want the user to be created with a different name than the resource name
@@ -26,7 +26,7 @@ spec:
     name: mariadb  # name of the MariaDB kind
     waitForIt: true
   passwordSecretKeyRef:
-    name: keystone-db-password
+    name: ironic-db-password
     key: password
   # This field is immutable and defaults to 10, 0 means unlimited.
   maxUserConnections: 0
@@ -36,7 +36,7 @@ spec:
 apiVersion: mariadb.mmontes.io/v1alpha1
 kind: Grant
 metadata:
-  name: keystone-grant
+  name: ironic-grant
   namespace: openstack
 spec:
   mariaDbRef:
@@ -44,9 +44,9 @@ spec:
     waitForIt: true
   privileges:
     - "ALL"
-  database: "keystone"
+  database: "ironic"
   table: "*"
-  username: keystone
+  username: ironic
   grantOption: true
   host: "%"
   retryInterval: 5s
diff --git a/components/13-ironic/ironic-rabbit-queue.yaml b/components/13-ironic/ironic-rabbitmq-queue.yaml
similarity index 76%
rename from components/13-ironic/ironic-rabbit-queue.yaml
rename to components/13-ironic/ironic-rabbitmq-queue.yaml
index da301b8c..d85c5080 100644
--- a/components/13-ironic/ironic-rabbit-queue.yaml
+++ b/components/13-ironic/ironic-rabbitmq-queue.yaml
@@ -2,7 +2,7 @@
 apiVersion: rabbitmq.com/v1beta1
 kind: User
 metadata:
-  name: keystone
+  name: ironic
   namespace: openstack
 spec:
   tags:
@@ -12,15 +12,15 @@ spec:
     name: rabbitmq # rabbitmqCluster must exist in the same namespace as this resource
     namespace: openstack
   importCredentialsSecret:
-    name: keystone-rabbitmq-password
+    name: ironic-rabbitmq-password
 ---
 apiVersion: rabbitmq.com/v1beta1
 kind: Vhost
 metadata:
-  name: keystone-vhost
+  name: ironic-vhost
   namespace: openstack
 spec:
-  name: "keystone" # vhost name; required and cannot be updated
+  name: "ironic" # vhost name; required and cannot be updated
   defaultQueueType: quorum # default queue type for this vhost; require RabbitMQ version 3.11.12 or above
   rabbitmqClusterReference:
     name: rabbitmq # rabbitmqCluster must exist in the same namespace as this resource
@@ -29,11 +29,11 @@ spec:
 apiVersion: rabbitmq.com/v1beta1
 kind: Queue
 metadata:
-  name: keystone-queue
+  name: ironic-queue
   namespace: openstack
 spec:
-  name: keystone-qq # name of the queue
-  vhost: "keystone" # default to '/' if not provided
+  name: ironic-qq # name of the queue
+  vhost: "ironic" # default to '/' if not provided
   type: quorum # without providing a queue type, rabbitmq creates a classic queue
   autoDelete: false
   durable: true # seting 'durable' to false means this queue won't survive a server restart
@@ -44,12 +44,12 @@ spec:
 apiVersion: rabbitmq.com/v1beta1
 kind: Permission
 metadata:
-  name: keystone-permission
+  name: ironic-permission
   namespace: openstack
 spec:
-  vhost: "keystone" # name of a vhost
+  vhost: "ironic" # name of a vhost
   userReference:
-    name: "keystone" # name of a user.rabbitmq.com in the same namespace; must specify either spec.userReference or spec.user
+    name: "ironic" # name of a user.rabbitmq.com in the same namespace; must specify either spec.userReference or spec.user
   permissions:
     write: ".*"
     configure: ".*"