diff --git a/Makefile b/Makefile
index c19ac940..be8e159c 100644
--- a/Makefile
+++ b/Makefile
@@ -49,8 +49,8 @@ test:
 	@(echo "gofmt -l"; FMTFILES="$$(gofmt -l .)"; if test -n "$${FMTFILES}"; then echo "Go files that need to be reformatted (use 'go fmt'):\n$${FMTFILES}"; exit 1; fi)
 
 docker:
-	docker build . -t leaseweb/cloudstack-kubernetes-provider:${GIT_COMMIT_SHORT}
-	docker tag leaseweb/cloudstack-kubernetes-provider:${GIT_COMMIT_SHORT} leaseweb/cloudstack-kubernetes-provider:latest
+	docker build . -t ghcr.io/leaseweb/cloudstack-kubernetes-provider:${GIT_COMMIT_SHORT}
+	docker tag ghcr.io/leaseweb/cloudstack-kubernetes-provider:${GIT_COMMIT_SHORT} ghcr.io/leaseweb/cloudstack-kubernetes-provider:latest
 ifneq (${GIT_IS_TAG},NOT_A_TAG)
-	docker tag leaseweb/cloudstack-kubernetes-provider:${GIT_COMMIT_SHORT} leaseweb/cloudstack-kubernetes-provider:${GIT_TAG}
+	docker tag ghcr.io/leaseweb/cloudstack-kubernetes-provider:${GIT_COMMIT_SHORT} ghcr.io/leaseweb/cloudstack-kubernetes-provider:${GIT_TAG}
 endif
diff --git a/charts/cloud-controller-manager/templates/deploy.yaml b/charts/cloud-controller-manager/templates/deploy.yaml
index 7af7e125..b69394fa 100644
--- a/charts/cloud-controller-manager/templates/deploy.yaml
+++ b/charts/cloud-controller-manager/templates/deploy.yaml
@@ -108,7 +108,8 @@ spec:
       hostNetwork: {{ .Values.hostNetwork}}
       {{- if .Values.hostNetwork }}
       dnsPolicy: {{ .Values.dnsPolicy}}
-      {{- end }}      {{- if .Values.priorityClassName }}
+      {{- end }}
+      {{- if .Values.priorityClassName }}
       priorityClassName: {{ .Values.priorityClassName }}
       {{- end }}
       {{- if or (.Values.extraVolumes) (.Values.secret.enabled) }}
diff --git a/charts/cloud-controller-manager/values.yaml b/charts/cloud-controller-manager/values.yaml
index 0dab4b72..a0437ed4 100644
--- a/charts/cloud-controller-manager/values.yaml
+++ b/charts/cloud-controller-manager/values.yaml
@@ -29,7 +29,7 @@ commonAnnotations: {}
 
 # Image repository name and tag
 image:
-  repository: "ghcr.io/leaseweb/cloud-controller-manager"
+  repository: "ghcr.io/leaseweb/cloudstack-kubernetes-provider"
   tag: "1.0.0"
 
 # Additional containers which are run before the app containers are started.
@@ -118,10 +118,9 @@ cloudConfig:
 # for description of individual verbosity levels.
 logVerbosityLevel: 2
 
-
 ## Pod priority settings
 ## ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/
-priorityClassName:
+priorityClassName: system-node-critical
 
 # The following three volumes are required to use all CCM controllers,
 # but might not be needed if you just use a specific controller