diff --git a/.gitignore b/.gitignore
index fbc63c1..d79e657 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,8 @@
 /node_modules/
-/public/build/
+/build/
 
 .DS_Store
 
 __debug_bin
 
-bin/
-static/
 homeservice.tar.gz
diff --git a/Makefile b/Makefile
index 05eb4de..f7fad84 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ SYSTEM_DIR := /usr/lib/systemd/system
 WEB_DIR := /var/lib/$(PROJECT_NAME)
 
 CONFIG_FILE := config/config.json
-BIN_FILE := bin/$(PROJECT_NAME)
+BIN_FILE := build/bin/$(PROJECT_NAME)
 UNIT_FILE := $(PROJECT_NAME).service
 README_FILE := README.md
 
diff --git a/main.go b/main.go
index a8185c2..ed76a51 100644
--- a/main.go
+++ b/main.go
@@ -74,7 +74,7 @@ func main() {
 	logger.Println("starting")
 
 	var webui_path string
-	flag.StringVar(&webui_path, "d", "./static", "Specify path to serve the web ui. Default is ./static")
+	flag.StringVar(&webui_path, "d", "./build/webui", "Specify path to serve the web ui. Default is ./static")
 	flag.Parse()
 
 	// MQTT connection