diff --git a/docs/book/src/topics/powervs/external-cloud-provider.md b/docs/book/src/topics/powervs/external-cloud-provider.md
index afb7f50ea..ab42145a3 100644
--- a/docs/book/src/topics/powervs/external-cloud-provider.md
+++ b/docs/book/src/topics/powervs/external-cloud-provider.md
@@ -2,8 +2,9 @@
 
 ## Steps
 
-- To deploy a Power VS workload cluster with IBM Power VS external cloud provider, create a cluster configuration with the [external cloud provider template](https://github.com/kubernetes-sigs/cluster-api-provider-ibmcloud/blob/main/templates/cluster-template-powervs-external-cloud-provider.yaml)
-- The [external cloud provider template](https://github.com/kubernetes-sigs/cluster-api-provider-ibmcloud/blob/main/templates/cluster-template-powervs-external-cloud-provider.yaml) will use [clusterresourceset](https://cluster-api.sigs.k8s.io/tasks/experimental-features/cluster-resource-set.html) and will create the necessary config map, secret and roles to runt the cloud controller manager
+- To deploy a Power VS workload cluster with IBM Power VS external cloud provider, create a cluster configuration with the [external cloud provider template](https://github.com/kubernetes-sigs/cluster-api-provider-ibmcloud/blob/main/templates/cluster-template-powervs-cloud-provider.yaml)
+- The [external cloud provider template](https://github.com/kubernetes-sigs/cluster-api-provider-ibmcloud/blob/main/templates/cluster-template-powervs-cloud-provider.yaml) will use [clusterresourceset](https://cluster-api.sigs.k8s.io/tasks/experimental-features/cluster-resource-set.html) and will create the necessary config map, secret and roles to run the cloud controller manager
+- As a prerequisite set the [`powervs-provider-id-fmt`](https://github.com/kubernetes-sigs/cluster-api-provider-ibmcloud/blob/64c9e1d17f1733c721f45a559edba3f4b712bcb0/main.go#L220) flag with value v2
   
   ```
   IBMPOWERVS_SSHKEY_NAME="my-pub-key" \
diff --git a/hack/ccm/Dockerfile b/hack/ccm/Dockerfile
index b1ed639a4..65e302314 100644
--- a/hack/ccm/Dockerfile
+++ b/hack/ccm/Dockerfile
@@ -1,3 +1,17 @@
+# Copyright 2022 The Kubernetes Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 ARG GOLANG_IMAGE=golang:1.17
 ARG TARGETPLATFORM=linux/amd64
 ARG ARCH=amd64
diff --git a/hack/ccm/Makefile b/hack/ccm/Makefile
index e5546bf7c..f6139234c 100644
--- a/hack/ccm/Makefile
+++ b/hack/ccm/Makefile
@@ -1,5 +1,18 @@
-#TODO: Update the registry
-REGISTRY=quay.io/kabhat
+# Copyright 2022 The Kubernetes Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+REGISTRY=gcr.io/k8s-staging-capi-ibmcloud
 IMG=powervs-cloud-controller-manager
 
 # VPC_CONTROLLER_COMMIT can be fetched from here https://github.com/openshift/cloud-provider-vpc-controller/commits/master
@@ -31,8 +44,10 @@ init-buildx:
 	docker buildx rm multiarch-multiplatform-builder
 	docker buildx create --use --name=multiarch-multiplatform-builder
 	docker run --rm --privileged multiarch/qemu-user-static --reset --credential yes --persistent yes
+	# Register gcloud as a Docker credential helper.
 	# Required for "docker buildx build --push".
-	#TODO: Add respective registry login info
+	gcloud auth configure-docker --quiet
+
 
 build-and-push-multi-arch: build-image-and-push-linux-amd64 build-image-and-push-linux-ppc64le
 	docker manifest create --amend $(REGISTRY)/$(IMG):$(TAG) $(REGISTRY)/$(IMG):$(TAG)_linux_amd64 $(REGISTRY)/$(IMG):$(TAG)_linux_ppc64le