diff --git a/src/elasticsearch/.env.example b/src/elasticsearch/.env.example
index 4de722b..527958e 100644
--- a/src/elasticsearch/.env.example
+++ b/src/elasticsearch/.env.example
@@ -1,5 +1,5 @@
 # Elasticsearch version
-ELASTICSEARCH_VERSION=8.16.1
+ELASTICSEARCH_VERSION=9.2.0
 
 # Timezone
 TZ=UTC
diff --git a/src/elasticsearch/docker-compose.yaml b/src/elasticsearch/docker-compose.yaml
index 5d2959c..e7e3db6 100644
--- a/src/elasticsearch/docker-compose.yaml
+++ b/src/elasticsearch/docker-compose.yaml
@@ -9,7 +9,7 @@ x-defaults: &defaults
 services:
   elasticsearch:
     <<: *defaults
-    image: docker.elastic.co/elasticsearch/elasticsearch:${ELASTICSEARCH_VERSION:-8.16.1}
+    image: docker.elastic.co/elasticsearch/elasticsearch-wolfi:${ELASTICSEARCH_VERSION:-9.2.0}
     ports:
       - "${ELASTICSEARCH_HTTP_PORT_OVERRIDE:-9200}:9200"
       - "${ELASTICSEARCH_TRANSPORT_PORT_OVERRIDE:-9300}:9300"
diff --git a/src/kibana/.env.example b/src/kibana/.env.example
index 3302f0e..4cb52da 100644
--- a/src/kibana/.env.example
+++ b/src/kibana/.env.example
@@ -1,5 +1,5 @@
 # Kibana version
-KIBANA_VERSION=8.16.1
+KIBANA_VERSION=9.2.0
 
 # Timezone
 TZ=UTC
diff --git a/src/kibana/docker-compose.yaml b/src/kibana/docker-compose.yaml
index b87484e..e54027d 100644
--- a/src/kibana/docker-compose.yaml
+++ b/src/kibana/docker-compose.yaml
@@ -9,7 +9,7 @@ x-defaults: &defaults
 services:
   kibana:
     <<: *defaults
-    image: docker.elastic.co/kibana/kibana:${KIBANA_VERSION:-8.16.1}
+    image: docker.elastic.co/kibana/kibana:${KIBANA_VERSION:-9.2.0}
     ports:
       - "${KIBANA_PORT_OVERRIDE:-5601}:5601"
     volumes:
@@ -19,7 +19,7 @@ services:
       # - ./kibana.yml:/usr/share/kibana/config/kibana.yml:ro
     environment:
       - TZ=${TZ:-UTC}
-      - SERVERNAME=kibana
+      - SERVERNAME=${KIBANA_SERVERNAME:-kibana}
       - ELASTICSEARCH_HOSTS=${ELASTICSEARCH_HOSTS:-http://elasticsearch:9200}
       - ELASTICSEARCH_USERNAME=${ELASTICSEARCH_USERNAME:-}
       - ELASTICSEARCH_PASSWORD=${ELASTICSEARCH_PASSWORD:-}