diff --git a/.env b/.env
index 46cdb6f990..f6175cce45 100644
--- a/.env
+++ b/.env
@@ -69,11 +69,11 @@ SOLR_CONFIG_SET="search_api_solr_4.1.6"
 
 ### --- ELASTICSEARCH ---
 
-ELASTICSEARCH_TAG=7-5.19.7
+ELASTICSEARCH_TAG=7-5.19.11
 
 ### --- KIBANA ---
 
-KIBANA_TAG=7-5.19.7
+KIBANA_TAG=7-5.19.11
 
 ### --- VALKEY ---
 
diff --git a/compose.yml b/compose.yml
index ecf7ee4e41..aa788577ef 100644
--- a/compose.yml
+++ b/compose.yml
@@ -224,6 +224,23 @@ services:
 #    - files:/mnt/files
 #    - ./:/mnt/codebase:cached
 
+#  elasticsearch:
+#    image: wodby/elasticsearch:$ELASTICSEARCH_TAG
+#    environment:
+#      ES_JAVA_OPTS: "-Xms500m -Xmx500m"
+#    ulimits:
+#      memlock:
+#        soft: -1
+#        hard: -1
+
+#  kibana:
+#    image: wodby/kibana:$KIBANA_TAG
+#    depends_on:
+#    - elasticsearch
+#    labels:
+#    - "traefik.http.services.${PROJECT_NAME}_kibana.loadbalancer.server.port=5601"
+#    - "traefik.http.routers.${PROJECT_NAME}_kibana.rule=Host(`kibana.${PROJECT_BASE_URL}`)"
+
 #  opensmtpd:
 #    container_name: "${PROJECT_NAME}_opensmtpd"
 #    image: wodby/opensmtpd:$OPENSMTPD_TAG