diff --git a/charts/kubedb-crd-manager/templates/_helpers.tpl b/charts/kubedb-crd-manager/templates/_helpers.tpl
index 9ec706683..40ad1e9e2 100644
--- a/charts/kubedb-crd-manager/templates/_helpers.tpl
+++ b/charts/kubedb-crd-manager/templates/_helpers.tpl
@@ -91,7 +91,7 @@ Returns the registry used for image docker image
 Returns the registry used for cleaner docker image
 */}}
 {{- define "cleaner.registry" -}}
-{{- list .Values.registryFQDN .Values.cleaner.registry | compact | join "/" }}
+{{- list .Values.cleaner.registryFQDN .Values.cleaner.registry | compact | join "/" }}
 {{- end }}
 
 {{- define "docker.imagePullSecrets" -}}
diff --git a/charts/kubedb-crd-manager/values.yaml b/charts/kubedb-crd-manager/values.yaml
index 713177e25..712e3ef2a 100644
--- a/charts/kubedb-crd-manager/values.yaml
+++ b/charts/kubedb-crd-manager/values.yaml
@@ -11,6 +11,7 @@ image:
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
 cleaner:
+  registryFQDN: ghcr.io
   # Docker registry used to pull Webhook cleaner image
   registry: appscode
   # Webhook cleaner container image