diff --git a/Makefile b/Makefile
index b51af0f..a2f313b 100644
--- a/Makefile
+++ b/Makefile
@@ -71,5 +71,15 @@ hosts: vendor/hosts
 
 # Clean-up the envirinment
 .PHONY: clean
+.ONESHELL:
 clean:
 	@rm -rf vendor/*
+	@for svc in $(START_SVCS)
+	do
+		vols=`docker-compose -f services/$${svc}/docker-compose.yml config --volumes`
+		if [[ ! -z "$${vols}" ]]; then
+			for vol in $${vols}; do
+				docker volume rm "$${svc}_$${vol}" 2> /dev/null
+			done
+		fi
+	done
diff --git a/services/storage/docker-compose.yml b/services/storage/docker-compose.yml
index 0cc352e..9696e85 100644
--- a/services/storage/docker-compose.yml
+++ b/services/storage/docker-compose.yml
@@ -15,6 +15,7 @@ services:
     volumes:
       - ./01.key:/01.key
       - ./../../vendor/hosts:/etc/hosts
+      - storage_s01:/storage
     stop_signal: SIGKILL
     env_file: [ ".env", ".storage.env" ]
     environment:
@@ -36,6 +37,7 @@ services:
     volumes:
       - ./02.key:/02.key
       - ./../../vendor/hosts:/etc/hosts
+      - storage_s02:/storage
     stop_signal: SIGKILL
     env_file: [ ".env", ".storage.env" ]
     environment:
@@ -57,6 +59,7 @@ services:
     volumes:
       - ./03.key:/03.key
       - ./../../vendor/hosts:/etc/hosts
+      - storage_s03:/storage
     stop_signal: SIGKILL
     env_file: [ ".env", ".storage.env" ]
     environment:
@@ -78,6 +81,7 @@ services:
     volumes:
       - ./04.key:/04.key
       - ./../../vendor/hosts:/etc/hosts
+      - storage_s04:/storage
     stop_signal: SIGKILL
     env_file: [ ".env", ".storage.env" ]
     environment:
@@ -86,6 +90,12 @@ services:
       - NEOFS_GRPC_ENDPOINT=s04.${LOCAL_DOMAIN}:8080
       - NEOFS_NODE_ATTRIBUTE_0=/Location:Europe/Country:Finalnd/City:Helsinki
 
+volumes:
+  storage_s01:
+  storage_s02:
+  storage_s03:
+  storage_s04:
+
 networks:
   storage_int:
   internet: