diff --git a/classes/cluster/virtual-mcp11-aio-telemetry/openstack/init.yml b/classes/cluster/virtual-mcp11-aio-telemetry/openstack/init.yml
index 5b7810b..74bf13b 100755
--- a/classes/cluster/virtual-mcp11-aio-telemetry/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio-telemetry/openstack/init.yml
@@ -83,11 +83,13 @@
           enabled: ${_param:rabbitmq_ssl_enabled}
   ceilometer:
     server:
+      region: ${_param:openstack_region}
       message_queue:
         port: ${_param:rabbitmq_port}
         ssl:
           enabled: ${_param:rabbitmq_ssl_enabled}
     agent:
+      region: ${_param:openstack_region}
       polling:
         sources:
           default_pollsters:
diff --git a/classes/cluster/virtual-mcp11-aio/openstack/init.yml b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
index a920e78..530c09d 100755
--- a/classes/cluster/virtual-mcp11-aio/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
@@ -43,7 +43,7 @@
     openstack_version: pike
     cluster_public_host: ${_param:single_address}
     cluster_public_protocol: http
-    openstack_region: RegionOne
+    openstack_region: CustomRegion
     admin_email: root@localhost
     rabbitmq_openstack_password: workshop
     galera_server_cluster_name: openstack_cluster
diff --git a/classes/system b/classes/system
index d68495f..945c3d1 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit d68495f2c99cd47be39d55b85e1ce15d876f83aa
+Subproject commit 945c3d1d94b8301e933afa02dd8fb667b33834c8