diff --git a/Makefile b/Makefile
index a8551f5..404edc5 100644
--- a/Makefile
+++ b/Makefile
@@ -5,18 +5,18 @@ build:
 
 .PHONY: fullclean
 fullclean: clean
-	docker rmi distrust-co -f
-	docker image prune --filter label=stage=distrust-co-builder
+	docker rmi distrust-co || true
+	docker image prune -f --filter label=stage=distrust-co-builder || true
 
 .PHONY: clean
 clean:
-	rm -r _site
+	rm -r _site || true
 
 _site: build
 	mkdir -p _site
 	docker run distrust-co tar c -C /usr/share/nginx/html . | tar x -C _site
 
 .PHONY: serve
-serve:
+serve: build
 	# Run Docker container with listener for current dir and port mapping
 	docker run --rm -p 0.0.0.0:4000:80 -it distrust-co