diff --git a/.gitreview b/.gitreview
index 197beb9..56d4a39 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,5 +1,5 @@
 [gerrit]
-host=gerrit.mcp.mirantis.net
+host=gerrit.mcp.mirantis.com
 port=29418
 project=salt-models/mcp-virtual-aio
 defaultbranch=stable/pike
diff --git a/classes/cluster/virtual-mcp11-aio-octavia/openstack/init.yml b/classes/cluster/virtual-mcp11-aio-octavia/openstack/init.yml
index beebbfe..67fcd8b 100755
--- a/classes/cluster/virtual-mcp11-aio-octavia/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio-octavia/openstack/init.yml
@@ -29,3 +29,4 @@
     octavia_public_key: |
       ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDnN4SKRSb/0lYXUfjZ6+VfsxoGV0yx5lB30ErbsVOdbSihw9KEIB16jn6EhmYemId2DBMuTY3KcXTbE2KaH0USTVYgxtQPvzx5gG4G8itybYpGNnnTJEdPhAcmAIgzXi7aUmMXpopziUyEoNki86ArL8uv3r8IOD+j37yLNPWfV27CD3ejpVm27xTib31T8gNN6OQHSeV4G1W8Fw5wscvlycbsqhGDzaPxyXV4rVoObtF9FG87UBIfs2k1F4M5aikRMnH1FihjGMZTozwxc+9gQaacYsPrglUAkBGigzZxgsiGZN+xVLwhvjABHC56E8ufQIR02JBtLR1cKdz7iyfB root@cfg01
     mcp_static_images_url: "http://images.mcp.mirantis.net"
+    # Dummy comment to trigger octavia deployment
diff --git a/classes/cluster/virtual-mcp11-aio/openstack/init.yml b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
index 4f2fa45..abd5334 100755
--- a/classes/cluster/virtual-mcp11-aio/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
@@ -299,6 +299,11 @@
         identity:
           admin:
             api_version: 3
+        admin_identity:
+          admin:
+            api_version: '3'
+            user_domain_name: 'Default'
+            project_domain_name: 'Default'
   heat:
     server:
       reauthentication_auth_method: 'trusts'