diff --git a/devstack/upgrade/settings b/devstack/upgrade/settings
index 2821e049db..7e29d72ca1 100644
--- a/devstack/upgrade/settings
+++ b/devstack/upgrade/settings
@@ -8,17 +8,17 @@ export TARGET_RUN_SMOKE=False
 export ENABLE_TEMPEST=False
 
 devstack_localrc base enable_service manila m-api m-shr m-sch m-dat
-devstack_localrc base enable_plugin manila git://git.openstack.org/openstack/manila stable/ocata
+devstack_localrc base enable_plugin manila git://git.openstack.org/openstack/manila stable/pike
 devstack_localrc base MANILA_UI_ENABLED=False
 devstack_localrc base OSLO_SERVICE_WORKS=True
 
 # NOTE(vponomaryov): stable client is used for keeping scenarios stable
 # so they are not broken by changed CLI view.
-devstack_localrc base MANILACLIENT_BRANCH="stable/ocata"
+devstack_localrc base MANILACLIENT_BRANCH="stable/pike"
 
 devstack_localrc target enable_service manila m-api m-shr m-sch m-dat
 devstack_localrc target enable_plugin manila git://git.openstack.org/openstack/manila
 devstack_localrc target MANILA_UI_ENABLED=False
 devstack_localrc target OSLO_SERVICE_WORKS=True
 devstack_localrc target MANILA_USE_DOWNGRADE_MIGRATIONS=False
-devstack_localrc target MANILACLIENT_BRANCH="stable/ocata"
+devstack_localrc target MANILACLIENT_BRANCH="stable/pike"