diff --git a/Makefile b/Makefile
index 47c6b9d5..24618934 100644
--- a/Makefile
+++ b/Makefile
@@ -321,6 +321,10 @@ build-%:
 stop-all:
 	docker-compose down;
 
+	cd lib/gohan && \
+	docker-compose down && \
+	cd ../.. ;
+
 #>>>
 # stop a specific service
 #<<<