diff --git a/compose-files/aquarius.yml b/compose-files/aquarius.yml
index 463b389..cea9117 100644
--- a/compose-files/aquarius.yml
+++ b/compose-files/aquarius.yml
@@ -30,5 +30,6 @@ services:
       EVENTS_RPC: "http://172.15.0.3:8545"
       EVENTS_ALLOW: "0"
       RUN_EVENTS_MONITOR: "1"
+      AQUARIUS_URL: http://172.15.0.5:5000
     volumes:
     - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/
diff --git a/compose-files/elasticsearch.yml b/compose-files/elasticsearch.yml
index c8c4e19..dadaf8d 100644
--- a/compose-files/elasticsearch.yml
+++ b/compose-files/elasticsearch.yml
@@ -2,6 +2,8 @@ version: '3'
 services:
   elasticsearch:
     image: elasticsearch:${ELASTICSEARCH_VERSION:-latest}
+    ports:
+      - 9200:9200
     networks:
       backend:
         ipv4_address: 172.15.0.6
@@ -9,3 +11,6 @@ services:
       ES_JAVA_OPTS: "-Xms512m -Xmx512m"
       MAX_MAP_COUNT: "64000"
       discovery.type: "single-node"
+      ELASTIC_PASSWORD: "changeme"
+      xpack.security.enabled: "false"
+      xpack.security.http.ssl.enabled: "false"
diff --git a/start_ocean.sh b/start_ocean.sh
old mode 100755
new mode 100644
index b9d8719..12675bf
--- a/start_ocean.sh
+++ b/start_ocean.sh
@@ -29,7 +29,7 @@ COMPOSE_DIR="${DIR}/compose-files"
 # Default versions of Aquarius, Provider
 
 export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v4.2.0}
-export ELASTICSEARCH_VERSION=${ELASTICSEARCH_VERSION:-7.14.2}
+export ELASTICSEARCH_VERSION=${ELASTICSEARCH_VERSION:-8.5.1}
 export PROVIDER_VERSION=${PROVIDER_VERSION:-v1.3.12}
 export SUBGRAPH_VERSION=${SUBGRAPH_VERSION:-v3.0.0}
 export CONTRACTS_VERSION=${CONTRACTS_VERSION:-v1.1.8}
@@ -88,7 +88,7 @@ export CONTRACTS_NETWORK_NAME="development"
 
 # Default Aquarius parameters: use Elasticsearch
 export DB_MODULE="elasticsearch"
-export DB_HOSTNAME="172.15.0.6"
+export DB_HOSTNAME="http://172.15.0.6"
 export DB_PORT="9200"
 export DB_USERNAME="elastic"
 export DB_PASSWORD="changeme"