diff --git a/README.rst b/README.rst
index b7427aa..2d599ab 100644
--- a/README.rst
+++ b/README.rst
@@ -795,6 +795,66 @@
 You can read more about it here:
     https://docs.openstack.org/security-guide/databases/database-access-control.html
 
+Upgrades
+========
+
+Each openstack formula provide set of phases (logical bloks) that will help to
+build flexible upgrade orchestration logic for particular components. The list
+of phases and theirs descriptions are listed in table below:
+
++-------------------------------+------------------------------------------------------+
+| State                         | Description                                          |
++===============================+======================================================+
+| <app>.upgrade.service_running | Ensure that all services for particular application  |
+|                               | are enabled for autostart and running                |
++-------------------------------+------------------------------------------------------+
+| <app>.upgrade.service_stopped | Ensure that all services for particular application  |
+|                               | disabled for autostart and dead                      |
++-------------------------------+------------------------------------------------------+
+| <app>.upgrade.pkgs_latest     | Ensure that packages used by particular application  |
+|                               | are installed to latest available version.           |
+|                               | This will not upgrade data plane packages like qemu  |
+|                               | and openvswitch as usually minimal required version  |
+|                               | in openstack services is really old. The data plane  |
+|                               | packages should be upgraded separately by `apt-get   |
+|                               | upgrade` or `apt-get dist-upgrade`                   |
+|                               | Applying this state will not autostart service.      |
++-------------------------------+------------------------------------------------------+
+| <app>.upgrade.render_config   | Ensure configuration is rendered actual version.     +
++-------------------------------+------------------------------------------------------+
+| <app>.upgrade.pre             | We assume this state is applied on all nodes in the  |
+|                               | cloud before running upgrade.                        |
+|                               | Only non destructive actions will be applied during  |
+|                               | this phase. Perform service built in service check   |
+|                               | like (keystone-manage doctor and nova-status upgrade)|
++-------------------------------+------------------------------------------------------+
+| <app>.upgrade.upgrade.pre     | Mostly applicable for data plane nodes. During this  |
+|                               | phase resources will be gracefully removed from      |
+|                               | current node if it is allowed. Services for upgraded |
+|                               | application will be set to admin disabled state to   |
+|                               | make sure node will not participate in resources     |
+|                               | scheduling. For example on gtw nodes this will set   |
+|                               | all agents to admin disable state and will move all  |
+|                               | routers to other agents.                             |
++-------------------------------+------------------------------------------------------+
+| <app>.upgrade.upgrade         | This state will basically upgrade application on     |
+|                               | particular target. Stop services, render             |
+|                               | configuration, install new packages, run offline     |
+|                               | dbsync (for ctl), start services. Data plane should  |
+|                               | not be affected, only OpenStack python services.     |
++-------------------------------+------------------------------------------------------+
+| <app>.upgrade.upgrade.post    | Add services back to scheduling.                     |
++-------------------------------+------------------------------------------------------+
+| <app>.upgrade.post            | This phase should be launched only when upgrade of   |
+|                               | the cloud is completed. Cleanup temporary files,     |
+|                               | perform other post upgrade tasks.                    |
++-------------------------------+------------------------------------------------------+
+| <app>.upgrade.verify          | Here we will do basic health checks (API CRUD        |
+|                               | operations, verify do not have dead network          |
+|                               | agents/compute services)                             |
++-------------------------------+------------------------------------------------------+
+
+
 **Documentation and bugs**
 ======================
 * http://salt-formulas.readthedocs.io/
diff --git a/cinder/upgrade/post/init.sls b/cinder/upgrade/post/init.sls
index fcad85f..ecd861e 100644
--- a/cinder/upgrade/post/init.sls
+++ b/cinder/upgrade/post/init.sls
@@ -1,3 +1,7 @@
 cinder_post:
   test.show_notification:
     - text: "Running cinder.upgrade.post"
+
+keystone_os_client_config_absent:
+  file.absent:
+    - name: /etc/openstack/clouds.yml
diff --git a/cinder/upgrade/pre/init.sls b/cinder/upgrade/pre/init.sls
index 5dcfa90..21c9efc 100644
--- a/cinder/upgrade/pre/init.sls
+++ b/cinder/upgrade/pre/init.sls
@@ -1,7 +1,14 @@
-include:
- - cinder.upgrade.verify.api
-
-
 cinder_pre:
   test.show_notification:
     - text: "Running cinder.upgrade.pre"
+
+{%- set os_content = salt['mine.get']('I@keystone:client:os_client_config:enabled:true', 'keystone_os_client_config', 'compound').values()[0] %}
+keystone_os_client_config:
+  file.managed:
+    - name: /etc/openstack/clouds.yml
+    - contents: |
+        {{ os_content |yaml(False)|indent(8) }}
+    - user: 'root'
+    - group: 'root'
+    - makedirs: True
+    - unless: test -f /etc/openstack/clouds.yml
diff --git a/cinder/upgrade/upgrade/init.sls b/cinder/upgrade/upgrade/init.sls
index 2a84a9a..7dc157a 100644
--- a/cinder/upgrade/upgrade/init.sls
+++ b/cinder/upgrade/upgrade/init.sls
@@ -3,8 +3,10 @@
     - text: "Running cinder.upgrade.upgrade"
 
 include:
+ - cinder.upgrade.upgrade.pre
  - cinder.upgrade.service_stopped
  - cinder.upgrade.pkgs_latest
  - cinder.upgrade.render_config
  - cinder.db.offline_sync
  - cinder.upgrade.service_running
+ - cinder.upgrade.upgrade.post
diff --git a/cinder/upgrade/upgrade/post.sls b/cinder/upgrade/upgrade/post.sls
new file mode 100644
index 0000000..940a957
--- /dev/null
+++ b/cinder/upgrade/upgrade/post.sls
@@ -0,0 +1,3 @@
+cinder_upgrade_uprade_post:
+  test.show_notification:
+    - text: "Running cinder.upgrade.upgrade.post"
diff --git a/cinder/upgrade/upgrade/pre.sls b/cinder/upgrade/upgrade/pre.sls
new file mode 100644
index 0000000..2892843
--- /dev/null
+++ b/cinder/upgrade/upgrade/pre.sls
@@ -0,0 +1,3 @@
+cinder_upgrade_upgrade_pre:
+  test.show_notification:
+    - text: "Running cinder.upgrade.upgrade.pre"
diff --git a/cinder/upgrade/verify/api.sls b/cinder/upgrade/verify/_api.sls
similarity index 100%
rename from cinder/upgrade/verify/api.sls
rename to cinder/upgrade/verify/_api.sls
diff --git a/cinder/upgrade/verify/init.sls b/cinder/upgrade/verify/init.sls
new file mode 100644
index 0000000..5b7aa99
--- /dev/null
+++ b/cinder/upgrade/verify/init.sls
@@ -0,0 +1,2 @@
+include:
+ - cinder.upgrade.verify._api