diff --git a/Makefile b/Makefile
index 52547c050c10bcda73cd2935b8e119e951337499..ae0d003e3c37d8026e83cb156d784f38e54ffc69 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,18 @@
-start:
+start: .handle
 	@echo "Start Handle System"
 	docker compose up --build --detach
-	docker exec test-handle-net-hs_server-1 /hs/templates/wait-for-it.sh 172.27.0.2:8000 -t 500 -- echo "HANDLE SERVICE ONLINE"
+	. ./.env && docker exec test-handle-net-hs_server-1 /hs/templates/wait-for-it.sh $${HANDLE_SERVER_IPV4_ADDRESS}:8000 -t 500 -- echo "HANDLE SERVICE ONLINE"
 	docker exec test-handle-net-hs_server-1 bin/hdl-genericbatch /hs/setup.batch.hdl
 
+.handle:
+	mkdir $@
+
 stop:
 	@echo "Stop Handle System"
 	docker compose down
 
-clean:
+clean: stop
 	@echo "Clean-up Handle System"
+	rm -rf .handle
 	docker compose down -v --rmi all
 	docker compose rm -vsf