diff --git a/ansible/roles/keystone/tasks/bootstrap.yml b/ansible/roles/keystone/tasks/bootstrap.yml
index 5d66451eee..dc1ecd6267 100644
--- a/ansible/roles/keystone/tasks/bootstrap.yml
+++ b/ansible/roles/keystone/tasks/bootstrap.yml
@@ -37,18 +37,5 @@
   run_once: True
   delegate_to: "{{ groups['keystone'][0] }}"
 
-- name: Running Keystone bootstrap container
-  kolla_docker:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    detach: False
-    environment:
-      KOLLA_BOOTSTRAP:
-      KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
-    image: "{{ keystone_image_full }}"
-    name: "bootstrap_keystone"
-    restart_policy: "never"
-    volumes: "{{ node_config_directory }}/keystone/:{{ container_config_directory }}/:ro"
-  run_once: True
-  delegate_to: "{{ groups['keystone'][0] }}"
+- include: bootstrap_service.yml
   when: database_created
diff --git a/ansible/roles/keystone/tasks/bootstrap_service.yml b/ansible/roles/keystone/tasks/bootstrap_service.yml
new file mode 100644
index 0000000000..6b8ad2bfa9
--- /dev/null
+++ b/ansible/roles/keystone/tasks/bootstrap_service.yml
@@ -0,0 +1,15 @@
+---
+- name: Running Keystone bootstrap container
+  kolla_docker:
+    action: "start_container"
+    common_options: "{{ docker_common_options }}"
+    detach: False
+    environment:
+      KOLLA_BOOTSTRAP:
+      KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
+    image: "{{ keystone_image_full }}"
+    name: "bootstrap_keystone"
+    restart_policy: "never"
+    volumes: "{{ node_config_directory }}/keystone/:{{ container_config_directory }}/:ro"
+  run_once: True
+  delegate_to: "{{ groups['keystone'][0] }}"
diff --git a/ansible/roles/keystone/tasks/upgrade.yml b/ansible/roles/keystone/tasks/upgrade.yml
new file mode 100644
index 0000000000..c0e3b19a40
--- /dev/null
+++ b/ansible/roles/keystone/tasks/upgrade.yml
@@ -0,0 +1,7 @@
+---
+- include: config.yml
+
+- include: bootstrap_service.yml
+
+- include: start.yml
+  serial: "30%"