diff --git a/Makefile b/Makefile
index 2c74c19..e55191c 100644
--- a/Makefile
+++ b/Makefile
@@ -90,12 +90,13 @@ docker-bot-build:
 
 docker-bot-rebuild:
 	docker-compose stop bot
-	docker-compose rm bot
-	docker-compose up -d bot
+	docker-compose rm -f bot
+	docker-compose up -d --build bot
 
 docker-bot-rebuild-full:
 	docker-compose stop bot
-	docker-compose rm -rf bot
+	docker-compose rm -f bot
+	docker rmi -f $$(docker images -q language_bot-bot 2>/dev/null) 2>/dev/null || true
 	docker-compose build --no-cache bot
 	docker-compose up -d bot