diff --git a/resources/chaosknoten/zammad/docker_compose/compose.yaml.j2 b/resources/chaosknoten/zammad/docker_compose/compose.yaml.j2
index b2e8f4d..ab1ed85 100644
--- a/resources/chaosknoten/zammad/docker_compose/compose.yaml.j2
+++ b/resources/chaosknoten/zammad/docker_compose/compose.yaml.j2
@@ -4,7 +4,7 @@ https://github.com/zammad/zammad-docker-compose
 Docker Compose does not allow defining variables in the compose file (only in .env files), so we use Jinja variables instead
 see https://github.com/zammad/zammad-docker-compose/blob/master/.env
 #}
-{%- set ELASTICSEARCH_VERSION = "8" | quote -%}
+{%- set ELASTICSEARCH_VERSION = "8.19.4" | quote -%}
 {%- set IMAGE_REPO = "ghcr.io/zammad/zammad" | quote -%}
 {%- set MEMCACHE_SERVERS = "zammad-memcached:11211" | quote -%}
 {%- set MEMCACHE_VERSION = "1.6-alpine" | quote -%}
@@ -80,10 +80,14 @@ services:
       - ./scripts/backup.sh:/usr/local/bin/backup.sh:ro
 
   zammad-elasticsearch:
-    image: bitnami/elasticsearch:{{ ELASTICSEARCH_VERSION }}
+    image: elasticsearch:{{ ELASTICSEARCH_VERSION }}
     restart: {{ RESTART }}
     volumes:
-      - elasticsearch-data:/bitnami/elasticsearch/data
+      - elasticsearch-data:/usr/share/elasticsearch/data
+    environment:
+      discovery.type: single-node
+      xpack.security.enabled: 'false'
+      ES_JAVA_OPTS: ${ELASTICSEARCH_JAVA_OPTS:--Xms1g -Xmx1g}
 
   zammad-init:
     <<: *zammad-service