diff --git a/defaults/init.yml b/defaults/init.yml
index ce011df..ccb0987 100644
--- a/defaults/init.yml
+++ b/defaults/init.yml
@@ -29,8 +29,6 @@
     banner_company_name: COMPANY_NAME
     motd_company_name: "${_param:banner_company_name}"
     ssh_banner_company_name: "${_param:banner_company_name}"
-    # Openstack globals
-    openstack_version: 'queens'
     # Docker artifact globals
     mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
     mcp_binary_registry: "https://${_param:mcp_docker_registry}/artifactory/binary-prod-local"
diff --git a/defaults/openstack/init.yml b/defaults/openstack/init.yml
index 5af6809..403173d 100644
--- a/defaults/openstack/init.yml
+++ b/defaults/openstack/init.yml
@@ -25,7 +25,7 @@
     openstack_memcache_security_strategy: 'ENCRYPT'
     openstack_memcached_proto_tcp_enabled: True
     openstack_memcached_proto_udp_enabled: False
-    openstack_version: ocata
+    openstack_version: queens
     openstack_old_version: ${_param:openstack_version}
     openstack_upgrade_enabled: False
     # Cinder