diff --git a/gerrit/client/team/mirantis.yml b/gerrit/client/team/mirantis.yml
index 41a0e17..0d8a4e1 100644
--- a/gerrit/client/team/mirantis.yml
+++ b/gerrit/client/team/mirantis.yml
@@ -8,8 +8,8 @@
           http_password: password
           ssh_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC3odU+3V2uDA2ptAFL9hrJRPNEEdAyztWOZFQ5Oyd9oerTGOU3p4xmrgWWjfKFKbYGhiiIUcYAol5PkTfKukGEkkjCHYA1t023soCaaAj85wCZCnw2zQNAziwxTYmAzTqgxiSvtZNMMrtJvFHRIRDzJ3M1lV0prWNWkMM1/3FAd4W49y6VT3fkMCo8uqG7CfGdgR2DgBCxf9KaNPfW5eDEPOgmE5lK8tVSEI6T+Cg7hbcTf4lFYnlFBnlQgp/0JstsM4Vbwb4B34LOpOsf2S8rrWk2xQMjwaMHXkc2s/E8iW3F5nVFuyEXYISFQIiAHw8dzC6CHgLcyHUVWwznKawZ
           groups:
-          - ${_param:cluster_name}-core
-          - ${_param:cluster_name}-release
+          - ${_param:cluster_name}_core
+          - ${_param:cluster_name}_release
         jpavlik:
           fullname: Jakub Pavlik
           email: "jpavlik@mirantis.com"
diff --git a/nginx/server/proxy/foundation/gerrit.yml b/nginx/server/proxy/foundation/gerrit.yml
new file mode 100644
index 0000000..8915b71
--- /dev/null
+++ b/nginx/server/proxy/foundation/gerrit.yml
@@ -0,0 +1,18 @@
+parameters:
+  nginx:
+    server:
+      enabled: true
+      site:
+        nginx_proxy_gerrit:
+          enabled: true
+          type: nginx_proxy
+          name: gerrit
+          proxy:
+            host: ${_param:fuel_version_control_node01_single_address}
+            port: 8082
+            protocol: http
+          host:
+            name: ${_param:cluster_public_host}
+            port: 8095
+            protocol: https
+          ssl: ${_param:nginx_proxy_ssl}
diff --git a/nginx/server/proxy/foundation/jenkins.yml b/nginx/server/proxy/foundation/jenkins.yml
new file mode 100644
index 0000000..9f10ad7
--- /dev/null
+++ b/nginx/server/proxy/foundation/jenkins.yml
@@ -0,0 +1,18 @@
+parameters:
+  nginx:
+    server:
+      enabled: true
+      site:
+        nginx_proxy_jenkins:
+          enabled: true
+          type: nginx_proxy
+          name: jenkins
+          proxy:
+            host: ${_param:fuel_integration_node01_single_address}
+            port: 8080
+            protocol: http
+          host:
+            name: ${_param:cluster_public_host}
+            port: 8095
+            protocol: https
+          ssl: ${_param:nginx_proxy_ssl}
diff --git a/nginx/server/proxy/stacklight/grafana.yml b/nginx/server/proxy/stacklight/grafana.yml
new file mode 100644
index 0000000..a1c7c49
--- /dev/null
+++ b/nginx/server/proxy/stacklight/grafana.yml
@@ -0,0 +1,18 @@
+parameters:
+  nginx:
+    server:
+      enabled: true
+      site:
+        nginx_proxy_grafana:
+          enabled: true
+          type: nginx_proxy
+          name: grafana
+          proxy:
+            host: ${_param:stacklight_monitor_address}
+            port: 3000
+            protocol: http
+          host:
+            name: ${_param:cluster_public_host}
+            port: 8084
+            protocol: https
+          ssl: ${_param:nginx_proxy_ssl}
diff --git a/nginx/server/proxy/stacklight/kibana.yml b/nginx/server/proxy/stacklight/kibana.yml
new file mode 100644
index 0000000..1120c9c
--- /dev/null
+++ b/nginx/server/proxy/stacklight/kibana.yml
@@ -0,0 +1,18 @@
+parameters:
+  nginx:
+    server:
+      enabled: true
+      site:
+        nginx_proxy_kibana:
+          enabled: true
+          type: nginx_proxy
+          name: kibana
+          proxy:
+            host: ${_param:stacklight_monitor_address}
+            port: 5601
+            protocol: http
+          host:
+            name: ${_param:cluster_public_host}
+            port: 5601
+            protocol: https
+          ssl: ${_param:nginx_proxy_ssl}
diff --git a/nginx/server/proxy/stacklight/nagios.yml b/nginx/server/proxy/stacklight/nagios.yml
new file mode 100644
index 0000000..8b57929
--- /dev/null
+++ b/nginx/server/proxy/stacklight/nagios.yml
@@ -0,0 +1,18 @@
+parameters:
+  nginx:
+    server:
+      enabled: true
+      site:
+        nginx_proxy_nagios:
+          enabled: true
+          type: nginx_proxy
+          name: nagios
+          proxy:
+            host: ${_param:stacklight_monitor_address}
+            port: 80
+            protocol: http
+          host:
+            name: ${_param:cluster_public_host}
+            port: 8001
+            protocol: https
+          ssl: ${_param:nginx_proxy_ssl}