diff --git a/ee/quickwit/Dockerfile b/ee/quickwit/Dockerfile
index 41af8ccae..00180501b 100644
--- a/ee/quickwit/Dockerfile
+++ b/ee/quickwit/Dockerfile
@@ -12,6 +12,9 @@ RUN apt-get install python3 python3-pip -y
 RUN apt-get clean
 RUN pip install -r requirements.txt
 
+COPY env.default .env
+RUN source .env
+
 ENV filter="true" \
 	encrypted="false"
 
diff --git a/ee/quickwit/consumer.py b/ee/quickwit/consumer.py
index e293475ca..af14f0a9b 100644
--- a/ee/quickwit/consumer.py
+++ b/ee/quickwit/consumer.py
@@ -105,7 +105,7 @@ class KafkaFilter():
             self.consumer = Consumer({
                 "security.protocol": "SSL",
                 "bootstrap.servers": kafka_sources,
-                "group.id":"saas-quickwit",
+                "group.id": config("group_id"),
                 "auto.offset.reset": "earliest",
                 "enable.auto.commit":False
             })
@@ -113,7 +113,7 @@ class KafkaFilter():
             self.consumer = Consumer({
                 "security.protocol": "SSL",
                 "bootstrap.servers": kafka_sources,
-                "group.id": "saas-quickwit",
+                "group.id": config("group_id"),
                 "auto.offset.reset": "earliest",
                 #value_deserializer=lambda m: json.loads(m.decode('utf-8')),
                 "enable.auto.commit": False
diff --git a/ee/quickwit/env.default b/ee/quickwit/env.default
new file mode 100644
index 000000000..2a646bf2d
--- /dev/null
+++ b/ee/quickwit/env.default
@@ -0,0 +1,6 @@
+KAFKA_SERVER=
+QUICKWIT_TOPIC=quickwit
+fetch_maxsize=800
+graphql_maxsize=800
+pageevent_maxsize=800
+group_id=ee-quickwit