diff --git a/templates/connect-compact/docker-compose.yml.j2 b/templates/connect-compact/docker-compose.yml.j2
index 153ab03..aca8391 100644
--- a/templates/connect-compact/docker-compose.yml.j2
+++ b/templates/connect-compact/docker-compose.yml.j2
@@ -34,6 +34,7 @@ services:
       - "traefik.http.services.{{ connect_id }}-extern.loadbalancer.server.port=8080"
 {% endif %}
     environment:
+      TZ: "Europe/Berlin"
       NAME: "MPM eXecution 2.0"
 
       TENANT_ID: "{{ connect_id }}"
@@ -135,6 +136,26 @@ services:
       - "{{ connect_id }}-elastic-data:/usr/share/elasticsearch/data"
     networks:
       - "back-tier"
+  {{ connect_id }}-kibana:
+    image: "docker.elastic.co/kibana/kibana:7.16.3"
+    container_name: "{{ connect_id }}-kibana"
+    restart: always
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.{{ connect_id }}-kibana.service={{ connect_id }}-kibana"
+      - "traefik.http.routers.{{ connect_id }}-kibana.rule=Host(`{{ connect_id }}-kibana.{{ domain }}`)"
+      - "traefik.http.routers.{{ connect_id }}-kibana.entrypoints=websecure"
+      - "traefik.http.routers.{{ connect_id }}-kibana.tls=true"
+      - "traefik.http.routers.{{ connect_id }}-kibana.tls.certresolver=letsencrypt-http"
+      - "traefik.http.services.{{ connect_id }}-kibana.loadbalancer.server.port=5601"
+      - "traefik.http.routers.{{ connect_id }}-kibana.middlewares={{ connect_id }}-kibana-ipwhitelist"
+      - "traefik.http.middlewares.{{ connect_id }}-kibana-ipwhitelist.ipwhitelist.sourcerange={{ ( ip_whitelist_netgo + ip_whitelist_admins ) | join(',') }}"
+    mem_limit: 1G
+    volumes:
+      - "./config/kibana/kibana.yml:/usr/share/kibana/config/kibana.yml:ro"
+    networks:
+      - "back-tier"
+      - "front-tier"
   {{ connect_id }}-iam:
     image: "{{ iam_image_name }}:{{ iam_version }}"
     container_name: "{{ connect_id }}-iam"