diff --git a/docker-compose/docker-compose.base.yml b/docker-compose/docker-compose.base.yml
index 1c5f703c..e1729765 100644
--- a/docker-compose/docker-compose.base.yml
+++ b/docker-compose/docker-compose.base.yml
@@ -23,6 +23,8 @@ services:
     restart: unless-stopped
     environment:
       - JAVA_TOOL_OPTIONS=-Xmx186m #deployment: 768m
+      - ELASTICSEARCH_USER=elastic
+      - ELASTICSEARCH_PASSWORD=gridsuiteelasticsearch
     command: >
       --server.port=80 
       --spring.config.additional-location=/config/ 
@@ -276,6 +278,8 @@ services:
         required: false
     environment:
       - JAVA_TOOL_OPTIONS=-Xmx768m #deployment: 1408m
+      - ELASTICSEARCH_USER=elastic
+      - ELASTICSEARCH_PASSWORD=gridsuiteelasticsearch
     command: --server.port=80 --spring.config.additional-location=/config/
     sysctls:
       - net.ipv4.ip_unprivileged_port_start=0 # for docker < 20.03.0
diff --git a/docker-compose/study/docker-compose.override.yml b/docker-compose/study/docker-compose.override.yml
index 5d560b2b..dc0b652f 100644
--- a/docker-compose/study/docker-compose.override.yml
+++ b/docker-compose/study/docker-compose.override.yml
@@ -21,6 +21,8 @@ services:
         required: false
     environment:
       - JAVA_TOOL_OPTIONS=-Xmx576m
+      - ELASTICSEARCH_USER=elastic
+      - ELASTICSEARCH_PASSWORD=gridsuiteelasticsearch
     command: --server.port=80 --spring.config.additional-location=/config/
     sysctls:
       - net.ipv4.ip_unprivileged_port_start=0 # for docker < 20.03.0
@@ -109,6 +111,8 @@ services:
         required: false
     environment:
       - JAVA_TOOL_OPTIONS=-Xmx768m #deployment: 1086m
+      - ELASTICSEARCH_USER=elastic
+      - ELASTICSEARCH_PASSWORD=gridsuiteelasticsearch
     command: --server.port=80 --spring.config.additional-location=/config/
     sysctls:
       - net.ipv4.ip_unprivileged_port_start=0 # for docker < 20.03.0
@@ -402,6 +406,8 @@ services:
         required: false
     environment:
       - JAVA_TOOL_OPTIONS=-Xmx186m # not used by the native image
+      - ELASTICSEARCH_USER=elastic
+      - ELASTICSEARCH_PASSWORD=gridsuiteelasticsearch
     command: --server.port=80 --spring.config.additional-location=/config/
     sysctls:
       - net.ipv4.ip_unprivileged_port_start=0 # for docker < 20.03.0
diff --git a/docker-compose/technical/docker-compose.technical.yml b/docker-compose/technical/docker-compose.technical.yml
index 3331c01f..1d9992eb 100644
--- a/docker-compose/technical/docker-compose.technical.yml
+++ b/docker-compose/technical/docker-compose.technical.yml
@@ -70,7 +70,7 @@ services:
     environment:
       - discovery.type=single-node
       - LOGSPOUT=ignore
-      - xpack.security.enabled=false
+      - xpack.security.enabled=true
       - ingest.geoip.downloader.enabled=false
       - ES_JAVA_OPTS=-Xms1g -Xmx1g
       - action.auto_create_index=filebeat-*
@@ -100,8 +100,11 @@ services:
       - 5601:5601
     environment:
       - LOGSPOUT=ignore
+      - ELASTIC_PASSWORD="gridsuitekibana"
     depends_on:
       - elasticsearch
+    volumes:
+      - $PWD/../technical/kibana.yml:/usr/share/kibana/config/kibana.yml:Z
     restart: unless-stopped
 
   logstash:
diff --git a/docker-compose/technical/kibana.yml b/docker-compose/technical/kibana.yml
new file mode 100644
index 00000000..3eb06466
--- /dev/null
+++ b/docker-compose/technical/kibana.yml
@@ -0,0 +1,7 @@
+# Default Kibana configuration for docker target
+server.host: "0.0.0.0"
+server.shutdownTimeout: "5s"
+elasticsearch.hosts: [ "http://elasticsearch:9200" ]
+monitoring.ui.container.elasticsearch.enabled: true
+elasticsearch.username: "kibana_system"
+elasticsearch.password: "gridsuitekibana"
\ No newline at end of file