diff --git a/docker-compose.yml b/docker-compose.yml
index 49a4c3a9..09d7ffb4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -662,8 +662,10 @@ services:
         - elasticsearch:/usr/share/elasticsearch/data
       environment:
         - cluster.name=laradock-cluster
+        - node.name=laradock-node
         - bootstrap.memory_lock=true
         - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+        - cluster.initial_master_nodes=laradock-node
       ulimits:
         memlock:
           soft: -1
@@ -1531,4 +1533,4 @@ services:
       depends_on:
         - postgres
       volumes:
-        - ${DATA_PATH_HOST}/Confluence:/var/atlassian/application-data
\ No newline at end of file
+        - ${DATA_PATH_HOST}/Confluence:/var/atlassian/application-data
diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile
index d3ff4f4e..dcc28741 100644
--- a/elasticsearch/Dockerfile
+++ b/elasticsearch/Dockerfile
@@ -1,3 +1,3 @@
-FROM docker.elastic.co/elasticsearch/elasticsearch:6.6.0
+FROM docker.elastic.co/elasticsearch/elasticsearch:7.1.1
 
 EXPOSE 9200 9300