diff --git a/.env.original b/.env.original
index 656d1b4a0..16d879a0a 100644
--- a/.env.original
+++ b/.env.original
@@ -6,7 +6,7 @@ TAG_IAM_SERVICE=1.15.0
 TAG_POSTGRES=9.6
 TAG_RABBITMQ=3.8-management
 TAG_REDIS=5.0.5
-TAG_ELASTICSEARCH=7.9.0
-TAG_LOGSTASH=7.9.0
+TAG_ELASTICSEARCH=7.16.3
+TAG_LOGSTASH=7.16.3
 TAG_NGINX=1.17
 REPORTING_PORT=8081
diff --git a/docker-compose.yml b/docker-compose.yml
index e323414fe..2bd0a3264 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -61,7 +61,7 @@ services:
     restart: always
 
   elasticsearch:
-    image: "docker.elastic.co/elasticsearch/elasticsearch-oss:${TAG_ELASTICSEARCH}"
+    image: "elasticsearch:${TAG_ELASTICSEARCH}"
     container_name: elasticsearch
     volumes:
       - "esdata-volume:/usr/share/elasticsearch/data"
@@ -69,6 +69,7 @@ services:
     environment:
       - bootstrap.memory_lock=true
       - LOG4J_FORMAT_MSG_NO_LOOKUPS=true
+      - ES_JAVA_OPTS=-Xmx1024m -Xms512m
     ulimits:
       memlock:
         soft: -1
@@ -79,7 +80,7 @@ services:
     restart: always
 
   logstash:
-    image: "docker.elastic.co/logstash/logstash-oss:${TAG_LOGSTASH}"
+    image: "logstash:${TAG_LOGSTASH}"
     container_name: logstash
     volumes:
       - "./configuration/logstash/logstash.conf:/usr/share/logstash/pipeline/logstash.conf:ro"