diff --git a/classes/cluster/k8s-ha-calico/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
index 2681e7f..7d5acb7 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
@@ -13,6 +13,7 @@
         - python-docker
       options:
         bip: 172.31.255.1/24
+        storage-driver: overlay2
   kubernetes:
     pool:
       kubelet:
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/stacklight/server.yml b/classes/cluster/virtual-mcp-ocata-cicd/stacklight/server.yml
index 18904ad..2902d76 100644
--- a/classes/cluster/virtual-mcp-ocata-cicd/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-ocata-cicd/stacklight/server.yml
@@ -41,6 +41,9 @@
     keepalived_prometheus_vip_password: password
     keepalived_prometheus_vip_interface: ens3
     # Docker/Elasticsearch
+    cluster_elasticsearch_port: 9200
+    cluster_kibana_port: 5601
+    cluster_grafana_port: 3000
     cluster_node01_hostname: ${_param:stacklight_node01_hostname}
     cluster_node01_address: ${_param:stacklight_node01_address}
     cluster_node02_hostname: ${_param:stacklight_node02_hostname}
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
index a5abebb..3bfee95 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
@@ -44,6 +44,9 @@
     keepalived_prometheus_vip_password: password
     keepalived_prometheus_vip_interface: ens4
     # Docker/Elasticsearch
+    cluster_elasticsearch_port: 9200
+    cluster_kibana_port: 5601
+    cluster_grafana_port: 3000
     cluster_node01_hostname: ${_param:stacklight_node01_hostname}
     cluster_node01_address: ${_param:stacklight_node01_address}
     cluster_node02_hostname: ${_param:stacklight_node02_hostname}
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
index 78c9849..fc5ea3f 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
@@ -53,6 +53,9 @@
     # Kibana
     kibana_elasticsearch_host: ${_param:cluster_vip_address}
     # Docker/Elasticsearch
+    cluster_elasticsearch_port: 9200
+    cluster_kibana_port: 5601
+    cluster_grafana_port: 3000
     cluster_node01_hostname: ${_param:stacklight_node01_hostname}
     cluster_node01_address: ${_param:stacklight_node01_address}
     cluster_node02_hostname: ${_param:stacklight_node02_hostname}
diff --git a/classes/system b/classes/system
index c314d5a..de47fb9 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit c314d5a3af310a7cfe198619be3f5aa15c0b25a5
+Subproject commit de47fb9ff49428ee30bb52d10dfc160641900715