diff --git a/ceph-provisioners/templates/configmap-etc-client.yaml b/ceph-provisioners/templates/configmap-etc-client.yaml
index bf6cc1f43..c706ef0c4 100644
--- a/ceph-provisioners/templates/configmap-etc-client.yaml
+++ b/ceph-provisioners/templates/configmap-etc-client.yaml
@@ -22,7 +22,7 @@ limitations under the License.
 {{- if or (.Values.deployment.ceph) (.Values.deployment.client_secrets) }}
 
 {{- if empty .Values.conf.ceph.global.mon_host -}}
-{{- $monHost := tuple "ceph_mon" "internal" "mon_msgr2" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" }}
+{{- $monHost := tuple "ceph_mon" "internal" "mon" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" }}
 {{- $_ := $monHost | set .Values.conf.ceph.global "mon_host" -}}
 {{- end -}}
 
diff --git a/helm-toolkit/templates/manifests/_ceph-storageclass.tpl b/helm-toolkit/templates/manifests/_ceph-storageclass.tpl
index 8d535d438..f4b1039b0 100644
--- a/helm-toolkit/templates/manifests/_ceph-storageclass.tpl
+++ b/helm-toolkit/templates/manifests/_ceph-storageclass.tpl
@@ -88,7 +88,7 @@ examples:
 {{- $envAll := index . "envAll" -}}
 {{- $monHost := $envAll.Values.conf.ceph.global.mon_host -}}
 {{- if empty $monHost -}}
-{{- $monHost = tuple "ceph_mon" "internal" "mon_msgr2" $envAll | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" -}}
+{{- $monHost = tuple "ceph_mon" "internal" "mon" $envAll | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" -}}
 {{- end -}}
 {{- $storageclassData := index . "storageclass_data" -}}
 ---