diff --git a/ansible/roles/ironic/tasks/bootstrap.yml b/ansible/roles/ironic/tasks/bootstrap.yml
index 7c774544f8..4932af3575 100644
--- a/ansible/roles/ironic/tasks/bootstrap.yml
+++ b/ansible/roles/ironic/tasks/bootstrap.yml
@@ -37,22 +37,7 @@
   run_once: True
   delegate_to: "{{ groups['ironic-api'][0] }}"
 
-- name: Running Ironic bootstrap container
-  kolla_docker:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    detach: False
-    environment:
-      KOLLA_BOOTSTRAP:
-      KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
-    image: "{{ ironic_api_image_full }}"
-    labels:
-      BOOTSTRAP:
-    name: "bootstrap_ironic"
-    restart_policy: "never"
-    volumes: "{{ node_config_directory }}/ironic-api/:{{ container_config_directory }}/:ro"
-  run_once: True
-  delegate_to: "{{ groups['ironic-api'][0] }}"
+- include: bootstrap_service.yml
   when: database_created
 
 - name: Running Ironic-PXE bootstrap container
diff --git a/ansible/roles/ironic/tasks/bootstrap_service.yml b/ansible/roles/ironic/tasks/bootstrap_service.yml
new file mode 100644
index 0000000000..115b27a0a4
--- /dev/null
+++ b/ansible/roles/ironic/tasks/bootstrap_service.yml
@@ -0,0 +1,16 @@
+- name: Running Ironic bootstrap container
+  kolla_docker:
+    action: "start_container"
+    common_options: "{{ docker_common_options }}"
+    detach: False
+    environment:
+      KOLLA_BOOTSTRAP:
+      KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
+    image: "{{ ironic_api_image_full }}"
+    labels:
+      BOOTSTRAP:
+    name: "bootstrap_ironic"
+    restart_policy: "never"
+    volumes: "{{ node_config_directory }}/ironic-api/:{{ container_config_directory }}/:ro"
+  run_once: True
+  delegate_to: "{{ groups['ironic-api'][0] }}"
diff --git a/ansible/roles/ironic/tasks/upgrade.yml b/ansible/roles/ironic/tasks/upgrade.yml
index ed97d539c0..c0e3b19a40 100644
--- a/ansible/roles/ironic/tasks/upgrade.yml
+++ b/ansible/roles/ironic/tasks/upgrade.yml
@@ -1 +1,7 @@
 ---
+- include: config.yml
+
+- include: bootstrap_service.yml
+
+- include: start.yml
+  serial: "30%"