diff --git a/Makefile b/Makefile
index 9647ed9a0..9bf6e85cd 100644
--- a/Makefile
+++ b/Makefile
@@ -166,7 +166,7 @@ test-azure-storage: start-azure-storage run-azure-tests stop-azure-storage ## ru
 
 .PHONY: start-azure-storage
 start-azure-storage: ## start local Azure storage (Azurite)
-	$(COMPOSE) -f tests/docker-compose-azure-blob-store.yaml up azurite azurite-init -d
+	$(COMPOSE) -f tests/docker-compose-azure-blob-store.yaml up azurite azurite-init -d --wait
 
 .PHONY: stop-azure-storage
 stop-azure-storage: ## stop local Azure storage (minio)
diff --git a/tests/docker-compose-azure-blob-store.yaml b/tests/docker-compose-azure-blob-store.yaml
index c1af9e0dd..aff62607c 100644
--- a/tests/docker-compose-azure-blob-store.yaml
+++ b/tests/docker-compose-azure-blob-store.yaml
@@ -14,7 +14,7 @@ services:
       "
 
   azurite:
-    image: mcr.microsoft.com/azure-storage/azurite
+    image: mcr.microsoft.com/azure-storage/azurite:3.35.0
     ports:
       - "10000:10000"
     volumes:
@@ -45,7 +45,7 @@ services:
       retries: 10
 
   azurite-init:
-    image: mcr.microsoft.com/azure-cli
+    image: mcr.microsoft.com/azure-cli:2.70.0
     depends_on:
       azurite:
         condition: service_healthy