diff --git a/Dockerfile b/Dockerfile
index 461c1fb..ba0fd86 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,4 +7,4 @@
 RUN apk --no-cache add ca-certificates
 WORKDIR /root/
 COPY --from=builder /go/src/github.com/swisstxt/cloudstack-cloud-controller-manager/cloudstack-ccm .
-CMD ["./cloudstack-ccm"]
+CMD ["./cloudstack-ccm", "--cloud-provider", "external-cloudstack"]
diff --git a/Makefile b/Makefile
index 97313b2..5772cb3 100644
--- a/Makefile
+++ b/Makefile
@@ -27,3 +27,7 @@
 
 docker:
 	docker build . -t cloudstack-cloud-controller-manager:${GIT_COMMIT_SHORT}
+	docker tag cloudstack-cloud-controller-manager:${GIT_COMMIT_SHORT} cloudstack-cloud-controller-manager:latest
+ifneq (${GIT_IS_TAG},NOT_A_TAG)
+	docker tag cloudstack-cloud-controller-manager:${GIT_COMMIT_SHORT} cloudstack-cloud-controller-manager:${GIT_TAG}
+endif
diff --git a/README.md b/README.md
index 3a6b097..e8e9b9c 100644
--- a/README.md
+++ b/README.md
@@ -116,15 +116,16 @@
 A Makefile is provided that sets these build flags to values obtained from git.
 
 ```bash
-go get github.com/swisstxt/cloudstack-cloud-controller-manager
-cd ${GOPATH}/src/github.com/swisstxt/cloudstack-cloud-controller-manager
+go get github.com/apache/cloudstack-kubernetes-provider
+cd ${GOPATH}/src/github.com/apache/cloudstack-kubernetes-provider
 make
 ```
 
-To build the cloudstack-cloud-controller-manager container, please use the provided Docker file:
+To build the cloudstack-cloud-controller-manager container, please use the provided Dockerfile.
+The Makefile will also with that and properly tag the resulting container.
 
 ```bash
-docker build . -t swisstxt/cloudstack-cloud-controller-manager:latest
+make docker
 ```
 
 ### Testing