diff --git a/Makefile b/Makefile
index 9bd25ac89..160e5aa3e 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ java/registry/target/registry.jar: $(SOURCES)
 
 test: build
 	@docker-compose -f docker-compose-v1.yml down
-	@sudo rm -rf db-data* || echo "no permission to delete"
+	@sudo rm -rf db-data* es-data* || echo "no permission to delete"
 	# test with distributed definition manager and native search
 	@docker-compose -f docker-compose-v1.yml --env-file test_environments/test_with_distributedDefManager_nativeSearch.env up -d db keycloak registry certificate-signer certificate-api redis
 	@echo "Starting the test" && sh build/wait_for_port.sh 8080
@@ -46,7 +46,7 @@ test: build
 	@curl -v http://localhost:8081/health
 	@cd java/apitest && MODE=async ../mvnw -Pe2e test
 	@docker-compose -f docker-compose-v1.yml down
-	@sudo rm -rf db-data-2 || echo "no permission to delete"
+	@sudo rm -rf db-data-2 es-data-2 || echo "no permission to delete"
 #	make -C services/identity-service test
 #	make -C services/credential-schema test
 #	make -C services/credentials-service test
diff --git a/docker-compose-v1.yml b/docker-compose-v1.yml
index ebb506ff9..b46f66d2f 100644
--- a/docker-compose-v1.yml
+++ b/docker-compose-v1.yml
@@ -3,6 +3,8 @@ version: '2.4'
 services:
   es:
     image: docker.elastic.co/elasticsearch/elasticsearch:7.17.13
+    volumes:
+      - ./${ES_DIR-es-data}:/usr/share/elasticsearch/data/*
     environment:
       - discovery.type=single-node
       - 'ES_JAVA_OPTS=-Xms512m -Xmx512m'
diff --git a/docker-compose.yml b/docker-compose.yml
index 96e593abd..e7ac9778f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,6 +3,8 @@ version: '2.4'
 services:
   es:
     image: docker.elastic.co/elasticsearch/elasticsearch:7.17.13
+    volumes:
+      - ./${ES_DIR-es-data}:/usr/share/elasticsearch/data/*
     environment:
       - discovery.type=single-node
       - 'ES_JAVA_OPTS=-Xms512m -Xmx512m'
diff --git a/test_environments/test_with_asyncCreate_events_notifications.env b/test_environments/test_with_asyncCreate_events_notifications.env
index 41e76f998..a07060c4f 100644
--- a/test_environments/test_with_asyncCreate_events_notifications.env
+++ b/test_environments/test_with_asyncCreate_events_notifications.env
@@ -13,3 +13,4 @@ NOTIFICATION_URL=http://notification-ms:8765/notification-service/v1/notificatio
 KEYCLOAK_IMPORT_DIR=java/apitest/src/test/resources
 KEYCLOAK_SECRET=**********
 DB_DIR=db-data-2
+ES_DIR=es-data-2