diff --git a/.gitignore b/.gitignore
index f7da97cdc..b2ae56ba9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,7 +18,5 @@ vendor/
 
 # Ignore executables
 target/
-mcs-server
 mcs
 !mcs/
-!mcs-server/
diff --git a/Makefile b/Makefile
index e2204885d..4bb792dd4 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ default: mcs
 .PHONY: mcs
 mcs:
 	@echo "Building mcs binary to './mcs'"
-	@(CGO_ENABLED=0 go build --tags kqueue --ldflags "-s -w" -o mcs ./cmd/mcs-server)
+	@(CGO_ENABLED=0 go build --tags kqueue --ldflags "-s -w" -o mcs ./cmd/mcs)
 
 swagger-gen:
 	@echo "Generating swagger server code from yaml"
@@ -11,7 +11,7 @@ swagger-gen:
 
 build:
 	@(cd portal-ui; yarn install; make build; cd ..)
-	@(CGO_ENABLED=0 go build --tags kqueue --ldflags "-s -w" -o mcs ./cmd/mcs-server)
+	@(CGO_ENABLED=0 go build --tags kqueue --ldflags "-s -w" -o mcs ./cmd/mcs)
 
 test:
 	@(go test ./restapi -v)
diff --git a/cmd/mcs-server/main.go b/cmd/mcs/main.go
similarity index 100%
rename from cmd/mcs-server/main.go
rename to cmd/mcs/main.go