diff --git a/conf.d/elasticsearch.shore.co.il.conf b/conf.d/elasticsearch.shore.co.il.conf
new file mode 100644
index 0000000000000000000000000000000000000000..051d4ba9e302833d8445c4c573f911d7c578bfbb
--- /dev/null
+++ b/conf.d/elasticsearch.shore.co.il.conf
@@ -0,0 +1,28 @@
+map $host $es { default elasticsearch; }
+
+server {
+    listen      80;
+    listen      [::]:80;
+    server_name elasticsearch.shore.co.il;
+    include     snippets/robots-disallow-all.conf;
+    include     snippets/ads-txt.conf;
+    include     snippets/security-txt.conf;
+    include     snippets/www-acme-challenge.conf;
+    include     snippets/redirect-https.conf;
+}
+
+server {
+    listen      443 ssl http2;
+    listen      [::]:443 ssl http2;
+    server_name elasticsearch.shore.co.il;
+    include     snippets/robots-disallow-all.conf;
+    include     snippets/ads-txt.conf;
+    include     snippets/security-txt.conf;
+    include     snippets/ssl.conf;
+
+    location / {
+        proxy_pass              http://$es:9200$request_uri;
+        proxy_http_version      1.1;
+        include                 snippets/allow-shore-ips.conf;
+    }
+}
diff --git a/conf.d/kibana.shore.co.il.conf b/conf.d/kibana.shore.co.il.conf
new file mode 100644
index 0000000000000000000000000000000000000000..d45ddb7172f9acfc284682ef0da6d37e6465f049
--- /dev/null
+++ b/conf.d/kibana.shore.co.il.conf
@@ -0,0 +1,29 @@
+map $host $kibana { default kibana; }
+
+server {
+    listen      80;
+    listen      [::]:80;
+    server_name kibana.shore.co.il;
+    include     snippets/robots-disallow-all.conf;
+    include     snippets/ads-txt.conf;
+    include     snippets/security-txt.conf;
+    include     snippets/www-acme-challenge.conf;
+    include     snippets/redirect-https.conf;
+}
+
+server {
+    listen      443 ssl http2;
+    listen      [::]:443 ssl http2;
+    server_name kibana.shore.co.il;
+    include     snippets/robots-disallow-all.conf;
+    include     snippets/ads-txt.conf;
+    include     snippets/security-txt.conf;
+    include     snippets/ssl.conf;
+    include     snippets/vouch.conf;
+
+    location / {
+        proxy_pass              http://$kibana:5601$request_uri;
+        proxy_http_version      1.1;
+        include                 snippets/proxy-headers.conf;
+    }
+}
diff --git a/docker-compose.yml b/docker-compose.yml
index 61c6f4b6031dca5596e31f3d402f816c1facc62d..c576757e3888c60d9e0acdf32b00724f5f9c15dd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,7 +11,9 @@ services:
         aliases:
           - *hostname
           - code.shore.co.il
+          - elasticsearch.shore.co.il
           - git.shore.co.il
+          - kibana.shore.co.il
           - lam.shore.co.il
           - mta-sts.shore.co.il
           - sogo.shore.co.il