diff --git a/ceph-client/values.yaml b/ceph-client/values.yaml
index db7a11b859..e6f000c2a8 100644
--- a/ceph-client/values.yaml
+++ b/ceph-client/values.yaml
@@ -166,9 +166,6 @@ network:
       port: 30004
   public: 192.168.0.0/16
   cluster: 192.168.0.0/16
-  port:
-    mon: 6789
-    mgr: 7000
 
 conf:
   features:
diff --git a/ceph-mon/templates/service-mon-discovery.yaml b/ceph-mon/templates/service-mon-discovery.yaml
index 75f6dad507..ffe2eacd03 100644
--- a/ceph-mon/templates/service-mon-discovery.yaml
+++ b/ceph-mon/templates/service-mon-discovery.yaml
@@ -31,9 +31,9 @@ metadata:
     service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
 spec:
   ports:
-  - port: {{ .Values.network.port.mon }}
+  - port: {{ tuple "ceph_mon" "discovery" "mon" $envAll | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
     protocol: TCP
-    targetPort: {{ .Values.network.port.mon }}
+    targetPort: {{ tuple "ceph_mon" "discovery" "mon" $envAll | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
   selector:
 {{ tuple $envAll "ceph" "mon" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   clusterIP: None
diff --git a/ceph-mon/templates/service-mon.yaml b/ceph-mon/templates/service-mon.yaml
index 823dbc0629..c69aa82c18 100644
--- a/ceph-mon/templates/service-mon.yaml
+++ b/ceph-mon/templates/service-mon.yaml
@@ -23,9 +23,9 @@ metadata:
   name: {{ tuple "ceph_mon" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
 spec:
   ports:
-  - port: {{ .Values.network.port.mon }}
+  - port: {{ tuple "ceph_mon" "internal" "mon" $envAll | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
     protocol: TCP
-    targetPort: {{ .Values.network.port.mon }}
+    targetPort: {{ tuple "ceph_mon" "internal" "mon" $envAll | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
   selector:
 {{ tuple $envAll "ceph" "mon" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   clusterIP: None
diff --git a/ceph-mon/values.yaml b/ceph-mon/values.yaml
index c9d7384593..9ff6c7c6b5 100644
--- a/ceph-mon/values.yaml
+++ b/ceph-mon/values.yaml
@@ -113,8 +113,6 @@ secrets:
 network:
   public: 192.168.0.0/16
   cluster: 192.168.0.0/16
-  port:
-    mon: 6789
 
 conf:
   templates: