diff --git a/charts/connector/templates/deployment.yaml b/charts/connector/templates/deployment.yaml
index 2e25f4c4a..e202ab408 100644
--- a/charts/connector/templates/deployment.yaml
+++ b/charts/connector/templates/deployment.yaml
@@ -42,7 +42,7 @@ spec:
       initContainers:
         - name: init
           image: "{{ include "fsmCurl.image" . }}"
-          command: ["curl", "http://fsm-bootstrap.{{ include "fsm.namespace" . }}.svc.cluster.local:9091/healthz", "--connect-timeout", "2", "--retry", "50", "--retry-connrefused", "--retry-delay", "5"]
+          command: ["curl", "http://fsm-bootstrap.{{ include "fsm.namespace" . }}:9091/healthz", "--connect-timeout", "2", "--retry", "50", "--retry-connrefused", "--retry-delay", "5"]
           resources:
             {{- toYaml .Values.fsm.cloudConnector.initResources | nindent 12 }}
       containers:
diff --git a/charts/fsm/README.md b/charts/fsm/README.md
index 9056c615b..6f4fe708a 100644
--- a/charts/fsm/README.md
+++ b/charts/fsm/README.md
@@ -436,7 +436,7 @@ The following table lists the configurable parameters of the fsm chart and their
 | fsm.prometheus.retention | object | `{"time":"15d"}` | Prometheus data rentention configuration |
 | fsm.prometheus.retention.time | string | `"15d"` | Prometheus data retention time |
 | fsm.prometheus.tolerations | list | `[]` | Node tolerations applied to control plane pods. The specified tolerations allow pods to schedule onto nodes with matching taints. |
-| fsm.remoteLogging.address | string | `""` | Address of the remote logging service (must contain the namespace). When left empty, this is computed in helper template to "remote-logging-service.<fsm-namespace>.svc.cluster.local". |
+| fsm.remoteLogging.address | string | `""` | Address of the remote logging service (must contain the namespace). When left empty, this is computed in helper template to "remote-logging-service.<fsm-namespace>". |
 | fsm.remoteLogging.authorization | string | `""` | The authorization for remote logging service |
 | fsm.remoteLogging.enable | bool | `false` | Toggles Sidecar's remote logging functionality on/off for all sidecar proxies in the mesh |
 | fsm.remoteLogging.endpoint | string | `""` | Remote logging's API path where the spans will be sent to |
@@ -464,7 +464,7 @@ The following table lists the configurable parameters of the fsm chart and their
 | fsm.sidecar.sidecarDisabledMTLS | bool | `false` | Sidecar runs without mTLS |
 | fsm.sidecar.sidecarLogLevel | string | `"error"` | Log level for the proxy sidecar. Non developers should generally never set this value. In production environments the LogLevel should be set to `error` |
 | fsm.sidecar.sidecarTimeout | int | `60` | Sets connect/idle/read/write timeout |
-| fsm.tracing.address | string | `""` | Address of the tracing collector service (must contain the namespace). When left empty, this is computed in helper template to "jaeger.<fsm-namespace>.svc.cluster.local". Please override for BYO-tracing as documented in tracing.md |
+| fsm.tracing.address | string | `""` | Address of the tracing collector service (must contain the namespace). When left empty, this is computed in helper template to "jaeger.<fsm-namespace>". Please override for BYO-tracing as documented in tracing.md |
 | fsm.tracing.affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].key | string | `"kubernetes.io/os"` |  |
 | fsm.tracing.affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].operator | string | `"In"` |  |
 | fsm.tracing.affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].values[0] | string | `"linux"` |  |
diff --git a/charts/fsm/templates/_helpers.tpl b/charts/fsm/templates/_helpers.tpl
index fac532a06..c1fb4d37b 100644
--- a/charts/fsm/templates/_helpers.tpl
+++ b/charts/fsm/templates/_helpers.tpl
@@ -5,7 +5,7 @@
 
 {{/* Default tracing address */}}
 {{- define "fsm.tracingAddress" -}}
-{{- $address := printf "jaeger.%s.svc.cluster.local" (include "fsm.namespace" .) -}}
+{{- $address := printf "jaeger.%s" (include "fsm.namespace" .) -}}
 {{ default $address .Values.fsm.tracing.address}}
 {{- end -}}
 
diff --git a/charts/fsm/templates/fsm-deployment.yaml b/charts/fsm/templates/fsm-deployment.yaml
index db13f5580..e32cca02d 100644
--- a/charts/fsm/templates/fsm-deployment.yaml
+++ b/charts/fsm/templates/fsm-deployment.yaml
@@ -41,7 +41,7 @@ spec:
       initContainers:
         - name: init-fsm-controller
           image: "{{ include "fsmCurl.image" . }}"
-          command: ["curl", "http://fsm-bootstrap.{{ include "fsm.namespace" . }}.svc.cluster.local:9091/healthz", "--connect-timeout", "2", "--retry", "50", "--retry-connrefused", "--retry-delay", "5"]
+          command: ["curl", "http://fsm-bootstrap.{{ include "fsm.namespace" . }}:9091/healthz", "--connect-timeout", "2", "--retry", "50", "--retry-connrefused", "--retry-delay", "5"]
           resources:
             {{- toYaml .Values.fsm.fsmController.initResources | nindent 12 }}
         - name: init-untar
diff --git a/charts/fsm/templates/fsm-ingress-deployment.yaml b/charts/fsm/templates/fsm-ingress-deployment.yaml
index 8d12c87d1..81ebcd2a6 100644
--- a/charts/fsm/templates/fsm-ingress-deployment.yaml
+++ b/charts/fsm/templates/fsm-ingress-deployment.yaml
@@ -44,7 +44,7 @@ spec:
         {{- end }}
         command:
           - curl
-          - http://fsm-controller.{{ include "fsm.namespace" . }}.svc.cluster.local:9091/health/ready
+          - http://fsm-controller.{{ include "fsm.namespace" . }}:9091/health/ready
           - --connect-timeout
           - "2"
           - --retry
diff --git a/charts/fsm/templates/fsm-injector-deployment.yaml b/charts/fsm/templates/fsm-injector-deployment.yaml
index f0bc83184..ec1f28f5e 100644
--- a/charts/fsm/templates/fsm-injector-deployment.yaml
+++ b/charts/fsm/templates/fsm-injector-deployment.yaml
@@ -38,7 +38,7 @@ spec:
       initContainers:
         - name: init-fsm-injector
           image: "{{ include "fsmCurl.image" . }}"
-          command: ["curl", "http://fsm-bootstrap.{{ include "fsm.namespace" . }}.svc.cluster.local:9091/healthz", "--connect-timeout", "2", "--retry", "50", "--retry-connrefused", "--retry-delay", "5"]
+          command: ["curl", "http://fsm-bootstrap.{{ include "fsm.namespace" . }}:9091/healthz", "--connect-timeout", "2", "--retry", "50", "--retry-connrefused", "--retry-delay", "5"]
           resources:
             {{- toYaml .Values.fsm.injector.initResources | nindent 12 }}
       containers:
diff --git a/charts/fsm/values.schema.json b/charts/fsm/values.schema.json
index e33d4f863..9bbf0b6bc 100644
--- a/charts/fsm/values.schema.json
+++ b/charts/fsm/values.schema.json
@@ -1359,7 +1359,7 @@
                       "title": "The address schema for tracing",
                       "description": "Address of the tracing collector",
                       "examples": [
-                        "jaeger.<fsm-namespace>.svc.cluster.local"
+                        "jaeger.<fsm-namespace>"
                       ]
                     },
                     "port": {
@@ -1476,7 +1476,7 @@
                             "title": "The address schema for remote logging service",
                             "description": "Address of the remote logging service",
                             "examples": [
-                                "remote-logging-service.<fsm-namespace>.svc.cluster.local"
+                                "remote-logging-service.<fsm-namespace>"
                             ]
                         },
                         "port": {
@@ -2646,7 +2646,7 @@
                     },
                     "examples": [
                         {
-                            "host": "vault.default.svc.cluster.local",
+                            "host": "vault.default",
                             "protocol": "http",
                             "token": "some-token",
                             "role": "flomesh"
diff --git a/charts/fsm/values.yaml b/charts/fsm/values.yaml
index 65dda40cf..a4d7d514a 100644
--- a/charts/fsm/values.yaml
+++ b/charts/fsm/values.yaml
@@ -538,7 +538,7 @@ fsm:
   tracing:
     # -- Toggles Sidecar's tracing functionality on/off for all sidecar proxies in the mesh
     enable: false
-    # -- Address of the tracing collector service (must contain the namespace). When left empty, this is computed in helper template to "jaeger.<fsm-namespace>.svc.cluster.local". Please override for BYO-tracing as documented in tracing.md
+    # -- Address of the tracing collector service (must contain the namespace). When left empty, this is computed in helper template to "jaeger.<fsm-namespace>". Please override for BYO-tracing as documented in tracing.md
     address: ""
     # -- Port of the tracing collector service
     port: 9411
@@ -590,7 +590,7 @@ fsm:
     enable: false
     # -- Level of the remote logging service
     level: 2
-    # -- Address of the remote logging service (must contain the namespace). When left empty, this is computed in helper template to "remote-logging-service.<fsm-namespace>.svc.cluster.local".
+    # -- Address of the remote logging service (must contain the namespace). When left empty, this is computed in helper template to "remote-logging-service.<fsm-namespace>".
     address: ""
     # -- Port of the remote logging service
     port: 30514
diff --git a/charts/gateway/templates/deployment.yaml b/charts/gateway/templates/deployment.yaml
index 47b59c457..d8f7d7e4f 100644
--- a/charts/gateway/templates/deployment.yaml
+++ b/charts/gateway/templates/deployment.yaml
@@ -67,7 +67,7 @@ spec:
         imagePullPolicy: {{ .Values.fsm.image.pullPolicy }}
         command:
           - curl
-          - {{ printf "http://fsm-controller.%s.svc.cluster.local:9091/health/ready" .Values.fsm.fsmNamespace }}
+          - {{ printf "http://fsm-controller.%s:9091/health/ready" .Values.fsm.fsmNamespace }}
           - --connect-timeout
           - "2"
           - --retry
diff --git a/charts/namespaced-ingress/templates/deployment.yaml b/charts/namespaced-ingress/templates/deployment.yaml
index 768f8f6e2..75f61dc54 100644
--- a/charts/namespaced-ingress/templates/deployment.yaml
+++ b/charts/namespaced-ingress/templates/deployment.yaml
@@ -41,7 +41,7 @@ spec:
         imagePullPolicy: {{ .Values.fsm.image.pullPolicy }}
         command:
           - curl
-          - {{ printf "http://fsm-controller.%s.svc.cluster.local:9091/health/ready" .Values.fsm.fsmNamespace }}
+          - {{ printf "http://fsm-controller.%s:9091/health/ready" .Values.fsm.fsmNamespace }}
           - --connect-timeout
           - "2"
           - --retry