diff --git a/Makefile b/Makefile
index f225a79..7281925 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # GLOBALS                                                                       #
 #################################################################################
 .DEFAULT_GOAL := help
-.PHONY: help build push start clean increment_version tag
+.PHONY: help build push start stop clean increment_version tag
 
 # Include project configuration
 include project.env
@@ -61,6 +61,15 @@ tag:
 start:
 	@./start.sh
 
+## stop and remove containers
+stop:
+	@echo 'stopping and removing containers'
+	@if [ -f './compose_override.yml' ]; then \
+		docker compose --env-file .env -f compose.yml -f compose_override.yml down; \
+	else \
+		docker compose --env-file .env -f compose.yml down; \
+	fi
+
 ## clean orphaned containers
 clean:
 	@echo 'removing dangling and unused images, containers, nets and volumes'