diff --git a/apache/server/proxy/openstack/aodh.yml b/apache/server/proxy/openstack/aodh.yml
index d8ae2eb..f4f63e5 100644
--- a/apache/server/proxy/openstack/aodh.yml
+++ b/apache/server/proxy/openstack/aodh.yml
@@ -18,6 +18,7 @@
             host: ${_param:apache_proxy_openstack_aodh_host}
             port: 8042
             protocol: http
+            retry: ${_param:apache_proxy_openstack_aodh_retry}
           host:
             name: ${_param:apache_proxy_openstack_api_host}
             port: 8042
diff --git a/apache/server/proxy/openstack/cinder.yml b/apache/server/proxy/openstack/cinder.yml
index 832c013..3380aea 100644
--- a/apache/server/proxy/openstack/cinder.yml
+++ b/apache/server/proxy/openstack/cinder.yml
@@ -18,6 +18,7 @@
             host: ${_param:apache_proxy_openstack_cinder_host}
             port: 8776
             protocol: http
+            retry: ${_param:apache_proxy_openstack_cinder_retry}
           host:
             name: ${_param:apache_proxy_openstack_api_host}
             port: 8776
diff --git a/apache/server/proxy/openstack/designate.yml b/apache/server/proxy/openstack/designate.yml
index c39c9a4..49a6744 100644
--- a/apache/server/proxy/openstack/designate.yml
+++ b/apache/server/proxy/openstack/designate.yml
@@ -22,6 +22,7 @@
             host: ${_param:apache_proxy_openstack_designate_host}
             port: 9001
             protocol: http
+            retry: ${_param:apache_proxy_openstack_designate_retry}
           host:
             name: ${_param:apache_proxy_openstack_api_host}
             port: 9001
diff --git a/apache/server/proxy/openstack/glance.yml b/apache/server/proxy/openstack/glance.yml
index f983ab4..0643804 100644
--- a/apache/server/proxy/openstack/glance.yml
+++ b/apache/server/proxy/openstack/glance.yml
@@ -18,6 +18,7 @@
             host: ${_param:apache_proxy_openstack_glance_host}
             port: 9292
             protocol: http
+            retry: ${_param:apache_proxy_openstack_glance_retry}
           host:
             name: ${_param:apache_proxy_openstack_api_host}
             port: 9292
diff --git a/apache/server/proxy/openstack/heat.yml b/apache/server/proxy/openstack/heat.yml
index f3aab22..d8f222a 100644
--- a/apache/server/proxy/openstack/heat.yml
+++ b/apache/server/proxy/openstack/heat.yml
@@ -18,6 +18,7 @@
             host: ${_param:apache_proxy_openstack_heat_host}
             port: 8004
             protocol: http
+            retry: ${_param:apache_proxy_openstack_heat_retry}
           host:
             name: ${_param:apache_proxy_openstack_api_host}
             port: 8004
@@ -32,6 +33,7 @@
             host: ${_param:apache_proxy_openstack_heat_host}
             port: 8000
             protocol: http
+            retry: ${_param:apache_proxy_openstack_heat_retry}
           host:
             name: ${_param:apache_proxy_openstack_api_host}
             port: 8000
@@ -46,6 +48,7 @@
             host: ${_param:apache_proxy_openstack_heat_host}
             port: 8003
             protocol: http
+            retry: ${_param:apache_proxy_openstack_heat_retry}
           host:
             name: ${_param:apache_proxy_openstack_api_host}
             port: 8003
diff --git a/apache/server/proxy/openstack/ironic.yml b/apache/server/proxy/openstack/ironic.yml
index b6abf0f..eea09e7 100644
--- a/apache/server/proxy/openstack/ironic.yml
+++ b/apache/server/proxy/openstack/ironic.yml
@@ -18,6 +18,7 @@
             host: ${_param:apache_proxy_openstack_ironic_host}
             port: 6385
             protocol: http
+            retry: ${_param:apache_proxy_openstack_ironic_retry}
           host:
             name: ${_param:apache_proxy_openstack_api_host}
             port: 6385
diff --git a/apache/server/proxy/openstack/neutron.yml b/apache/server/proxy/openstack/neutron.yml
index 1ed5726..ebef0d8 100644
--- a/apache/server/proxy/openstack/neutron.yml
+++ b/apache/server/proxy/openstack/neutron.yml
@@ -18,6 +18,7 @@
             host: ${_param:apache_proxy_openstack_neutron_host}
             port: 9696
             protocol: http
+            retry: ${_param:apache_proxy_openstack_neutron_retry}
           host:
             name: ${_param:apache_proxy_openstack_api_host}
             port: 9696
diff --git a/apache/server/proxy/openstack/nova.yml b/apache/server/proxy/openstack/nova.yml
index 610c6d5..c5ae5d1 100644
--- a/apache/server/proxy/openstack/nova.yml
+++ b/apache/server/proxy/openstack/nova.yml
@@ -18,6 +18,7 @@
             host: ${_param:apache_proxy_openstack_nova_host}
             port: 8774
             protocol: http
+            retry: ${_param:apache_proxy_openstack_nova_retry}
           host:
             name: ${_param:apache_proxy_openstack_api_host}
             port: 8774
diff --git a/apache/server/proxy/openstack/placement.yml b/apache/server/proxy/openstack/placement.yml
index 6030740..9becf3f 100644
--- a/apache/server/proxy/openstack/placement.yml
+++ b/apache/server/proxy/openstack/placement.yml
@@ -19,6 +19,7 @@
             host: ${_param:apache_proxy_openstack_placement_host}
             port: 8778
             protocol: http
+            retry: ${_param:apache_proxy_openstack_placement_retry}
           host:
             name: ${_param:apache_proxy_openstack_api_host}
             port: 8778
diff --git a/apache/server/single.yml b/apache/server/single.yml
index cbe5158..4675332 100644
--- a/apache/server/single.yml
+++ b/apache/server/single.yml
@@ -7,3 +7,6 @@
         status:
           enabled: ${_param:apache_mods_status_enabled}
           status: ${_param:apache_mods_status_status}
+          host:
+            address: ${_param:apache_mods_status_host_address}
+            port: ${_param:apache_mods_status_host_port}
diff --git a/defaults/openstack/init.yml b/defaults/openstack/init.yml
index 23f0332..b1578d8 100644
--- a/defaults/openstack/init.yml
+++ b/defaults/openstack/init.yml
@@ -98,7 +98,24 @@
     # Apache mods defaults
     apache_mods_status_enabled: True
     apache_mods_status_status: 'disabled'
+    apache_mods_status_host_address: '127.0.0.1'
+    apache_mods_status_host_port: 80
     apache_horizon_listen_address: '0.0.0.0'
+    # Apache proxies for openstack aren't used as HA proxies, they are
+    # simply ssl terminators in case of setup of ssl on internal endpoints
+    # for services which don't support running under apache and wsgi.
+    # So retry parameter is set 0, to eliminate maintenance mode for backend
+    # which is 60 seconds  by default.
+    apache_proxy_openstack_api_retry: 0
+    apache_proxy_openstack_cinder_retry: ${_param:apache_proxy_openstack_api_retry}
+    apache_proxy_openstack_designate_retry: ${_param:apache_proxy_openstack_api_retry}
+    apache_proxy_openstack_glance_retry: ${_param:apache_proxy_openstack_api_retry}
+    apache_proxy_openstack_heat_retry: ${_param:apache_proxy_openstack_api_retry}
+    apache_proxy_openstack_ironic_retry: ${_param:apache_proxy_openstack_api_retry}
+    apache_proxy_openstack_nova_retry: ${_param:apache_proxy_openstack_api_retry}
+    apache_proxy_openstack_neutron_retry: ${_param:apache_proxy_openstack_api_retry}
+    apache_proxy_openstack_aodh_retry: ${_param:apache_proxy_openstack_api_retry}
+    apache_proxy_openstack_placement_retry: ${_param:apache_proxy_openstack_api_retry}
     # Horizon
     # 'direct' mode will require cors on glance side to be enabled.
     horizon_images_upload_mode: 'direct'
diff --git a/kubernetes/common/init.yml b/kubernetes/common/init.yml
index c1a8bd6..19bbece 100644
--- a/kubernetes/common/init.yml
+++ b/kubernetes/common/init.yml
@@ -23,6 +23,7 @@
     kubernetes_corends_etcd_operator_repo: quay.io/coreos
     kubernetes_containerd_repo: https://github.com/kubernetes-sigs/cri-tools/releases/download
     kubernetes_openstack_provider_repo: ${_param:mcp_binary_registry}/mirantis/kubernetes/cloud-provider-openstack
+    kubernetes_metrics_server_repo: k8s.gcr.io
 
     # component images/binaries
     kubernetes_calico_image: ${_param:kubernetes_calico_repo}/node:v3.3.2
@@ -69,6 +70,7 @@
     kubernetes_calico_cni_image: ${_param:mcp_docker_registry}/mirantis/projectcalico/calico/cni:v3.3.2
     kubernetes_calico_calicoctl_image: ${_param:mcp_docker_registry}/mirantis/projectcalico/calico/ctl:v3.3.2
     kubernetes_containerd_package: containerd.io=1.2.0-1
+    kubernetes_metrics_server_image: ${_param:kubernetes_metrics_server_repo}/metrics-server-amd64:v0.3.1
 
     kubernetes_opencontrail_controller_image: ${_param:kubernetes_contrail_registry}/opencontrail-controller:${_param:mcp_version}
     kubernetes_opencontrail_analyticsdb_image: ${_param:kubernetes_contrail_registry}/opencontrail-analyticsdb:${_param:mcp_version}
@@ -92,6 +94,7 @@
     kubernetes_telegraf_enabled: false
     kubernetes_ingressnginx_enabled: false
     kubernetes_containerd_enabled: true
+    kubernetes_metrics_server_enabled: false
 
     kubernetes_ingressnginx_controller_replicas: 1
 
@@ -236,6 +239,9 @@
           enabled: ${_param:kubernetes_ingressnginx_enabled}
           controller_image: ${_param:kubernetes_ingressnginx_controller_image}
           controller_replicas: ${_param:kubernetes_ingressnginx_controller_replicas}
+        metrics-server:
+          enabled: ${_param:kubernetes_metrics_server_enabled}
+          controller_image: ${_param:kubernetes_metrics_server_image}
     pool:
       enabled: false
       kubelet: