diff --git a/docker-compose.yml b/docker-compose.yml
index caa5de0cc..c8cca19bb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -624,24 +624,27 @@ services:
 
 
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.0
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.3.3
     container_name: elasticsearch
     #restart: always
     healthcheck:
       start_period: 10s
       interval: 10s
       retries: 20
-      test: curl -s http://localhost:9200/_cluster/health | grep -vq '"status":"red"'
+      test: curl --user "elastic:es_pass" -s http://localhost:9200/_cluster/health | grep -vq '"status":"red"'
     ports:
       - 9200:9200
       - 9300:9300
     environment:
-      discovery.type: "single-node"
       ES_JAVA_OPTS: "-Xms1g -Xmx1g"
       cluster.name: "elasticsearch-cp-demo"
+      bootstrap.memory_lock: true
+      discovery.type: single-node
+      ELASTIC_PASSWORD: es_pass
+      xpack.security.enabled: false
 
   kibana:
-    image: docker.elastic.co/kibana/kibana-oss:7.10.0
+    image: docker.elastic.co/kibana/kibana:8.3.3
     container_name: kibana
     restart: always
     healthcheck: