diff --git a/Makefile b/Makefile
index 073cb8f..71cb21c 100755
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,16 @@
 .PHONY: dev-backend dev-frontend build clean
 
 dev-backend:
-	cd backend && go run ./cmd/server
+	cd backend && GO111MODULE=on go run ./cmd/server
 
 dev-frontend:
 	cd frontend && pnpm dev
 
 build:
 	cd frontend && pnpm install && pnpm build
-	rm -rf backend/static/*
+	find backend/static -not -name 'embed.go' -not -name '.gitkeep' -not -path backend/static -delete
 	cp -r frontend/dist/* backend/static/
-	cd backend && CGO_ENABLED=1 go build -o ../krafttrainer ./cmd/server
+	cd backend && GO111MODULE=on CGO_ENABLED=1 go build -o ../krafttrainer ./cmd/server
 
 clean:
 	rm -f krafttrainer