diff --git a/04_setup_ironic.sh b/04_setup_ironic.sh
index add589b17..1c62bbfdd 100755
--- a/04_setup_ironic.sh
+++ b/04_setup_ironic.sh
@@ -24,7 +24,7 @@ for IMAGE_VAR in IRONIC_IMAGE IRONIC_INSPECTOR_IMAGE IPA_DOWNLOADER_IMAGE COREOS
     fi
 done
 
-for name in ironic ironic-inspector dnsmasq httpd mariadb ipa-downloader coreos-downloader; do
+for name in ironic ironic-api ironic-conductor ironic-exporter ironic-inspector dnsmasq httpd mariadb ipa-downloader coreos-downloader; do
     sudo podman ps | grep -w "$name$" && sudo podman kill $name
     sudo podman ps --all | grep -w "$name$" && sudo podman rm $name -f
 done
@@ -51,9 +51,19 @@ sudo podman run -d --net host --privileged --name mariadb --pod ironic-pod \
      -v $IRONIC_DATA_DIR:/shared --entrypoint /bin/runmariadb \
      --env MARIADB_PASSWORD=$mariadb_password ${IRONIC_IMAGE}
 
-sudo podman run -d --net host --privileged --name ironic --pod ironic-pod \
+sudo podman run -d --net host --privileged --name ironic-conductor --pod ironic-pod \
      --env MARIADB_PASSWORD=$mariadb_password \
      --env OS_CONDUCTOR__HEARTBEAT_TIMEOUT=120 \
+     --entrypoint /bin/runironic-conductor \
+     -v $IRONIC_DATA_DIR:/shared ${IRONIC_IMAGE}
+
+sudo podman run -d --net host --privileged --name ironic-api --pod ironic-pod \
+     --env MARIADB_PASSWORD=$mariadb_password \
+     --entrypoint /bin/runironic-api \
+     -v $IRONIC_DATA_DIR:/shared ${IRONIC_IMAGE}
+
+sudo podman run -d --net host --privileged --name ironic-exporter --pod ironic-pod \
+     --entrypoint /bin/runironic-exporter \
      -v $IRONIC_DATA_DIR:/shared ${IRONIC_IMAGE}
 
 sudo podman run -d --net host --privileged --name ipa-downloader --pod ironic-pod \
diff --git a/06_create_cluster.sh b/06_create_cluster.sh
index 6159feff2..f77dbcbad 100755
--- a/06_create_cluster.sh
+++ b/06_create_cluster.sh
@@ -60,7 +60,7 @@ wait_for_json ironic \
     20 \
     -H "Accept: application/json" -H "Content-Type: application/json" -H "User-Agent: wait-for-json" -H "X-Auth-Token: $OS_TOKEN"
 
-if [ $(sudo podman ps | grep -w -e "ironic$" -e "ironic-inspector$" -e "dnsmasq" -e "httpd" | wc -l) != 4 ]; then
+if [ $(sudo podman ps | grep -w -e "ironic-api$" -e "ironic-conductor$" -e "ironic-inspector$" -e "dnsmasq" -e "httpd" | wc -l) != 5 ]; then
     echo "Can't find required containers"
     exit 1
 fi
diff --git a/ironic_cleanup.sh b/ironic_cleanup.sh
index cbd182610..48dd91c14 100755
--- a/ironic_cleanup.sh
+++ b/ironic_cleanup.sh
@@ -5,7 +5,7 @@ source logging.sh
 source common.sh
 
 # Kill and remove the running ironic containers
-for name in ironic ironic-inspector dnsmasq httpd mariadb; do
+for name in ironic ironic-api ironic-conductor ironic-exporter ironic-inspector dnsmasq httpd mariadb; do
     sudo podman ps | grep -w "$name$" && sudo podman kill $name
     sudo podman ps --all | grep -w "$name$" && sudo podman rm $name -f
 done