diff --git a/Dockerfile b/Dockerfile
index 2f6dd31..ddf3b98 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.12.5 as builder
+FROM golang:1.16 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests
@@ -14,11 +14,11 @@ COPY cmd/ cmd/
 COPY pkg/ pkg/
 
 # Build
-RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -a -o manager cmd/manager/main.go
+RUN make linux
 
 # Use distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details
 FROM gcr.io/distroless/static:latest
 WORKDIR /
-COPY --from=builder /workspace/manager .
-ENTRYPOINT ["/manager"]
\ No newline at end of file
+COPY --from=builder /workspace/platform-operator .
+ENTRYPOINT ["/platform-operator"]
diff --git a/Dockerfile.dev b/Dockerfile.dev
index 1a4ee69..f595a45 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -3,5 +3,5 @@
 # Refer to https://github.com/GoogleContainerTools/distroless for more details
 FROM gcr.io/distroless/static:latest
 WORKDIR /
-COPY bin/manager .
-ENTRYPOINT ["/manager"]
+COPY bin/platform-operator .
+ENTRYPOINT ["/platform-operator"]
diff --git a/Makefile b/Makefile
index 1e3ce10..a3490da 100644
--- a/Makefile
+++ b/Makefile
@@ -40,11 +40,11 @@ e2e:
 manager: fmt vet build
 
 build:
-	go build -o bin/manager cmd/manager/main.go
+	go build -o bin/platform-operator cmd/manager/main.go
 
 # Build manager binary
 linux:
-	GOOS=linux go build -o bin/manager cmd/manager/main.go
+	GOOS=linux go build -o bin/platform-operator cmd/manager/main.go
 
 # Run against the configured Kubernetes cluster in ~/.kube/config
 run: generate fmt vet