diff --git a/Dockerfile b/Dockerfile
index 5bc5da5..b716802 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,7 +25,8 @@ VOLUME /config
 VOLUME /storage
 
 WORKDIR $INBUCKET_HOME
-ENTRYPOINT "/start-inbucket.sh"
+ENTRYPOINT ["/start-inbucket.sh"]
+CMD ["-logjson"]
 
 # Build Inbucket
 COPY . $INBUCKET_SRC/
diff --git a/Makefile b/Makefile
index ff275c0..857fca5 100644
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,7 @@ $(commands): %: cmd/%
 clean:
 	go clean $(PKGS)
 	rm -f $(commands)
+	rm -rf dist
 
 deps:
 	go get -t ./...