diff --git a/freeleaps/helm-pkg/freeleaps/templates/freeleaps/freeleaps-config.yaml b/freeleaps/helm-pkg/freeleaps/templates/freeleaps/freeleaps-config.yaml
index 2702ee79..0909a3b6 100644
--- a/freeleaps/helm-pkg/freeleaps/templates/freeleaps/freeleaps-config.yaml
+++ b/freeleaps/helm-pkg/freeleaps/templates/freeleaps/freeleaps-config.yaml
@@ -27,6 +27,7 @@ data:
   FREELEAPS_NOTIFICATION_ENDPOINT: {{ .Values.freeleaps.configs.freeleapsNotificationEndpoint | b64enc | quote }}
   FREELEAPS_DEVOPS_ENDPOINT: {{ .Values.freeleaps.configs.freeleapsDevopsEndpoint | b64enc | quote }}
   FREELEAPS_DEPLOYMENT_ENDPOINT: {{ .Values.freeleaps.configs.freeleapsDeploymentEndpoint | b64enc | quote }}
+  FREELEAPS_METRICS_ENDPOINT: {{ .Values.freeleaps.configs.freeleapsMetricsEndpoint | b64enc | quote }}
   APP_ENV: {{ .Values.freeleaps.configs.appEnv | b64enc | quote }}
   REDIS_IS_CLUSTER: {{ .Values.freeleaps.configs.redisIsCluster | b64enc | quote }}
   METRICS_ENABLED: {{ .Values.freeleaps.configs.metricsEnabled | default false | toString | b64enc }}
diff --git a/freeleaps/helm-pkg/freeleaps/values.alpha.yaml b/freeleaps/helm-pkg/freeleaps/values.alpha.yaml
index 72ced5e4..39249435 100644
--- a/freeleaps/helm-pkg/freeleaps/values.alpha.yaml
+++ b/freeleaps/helm-pkg/freeleaps/values.alpha.yaml
@@ -77,6 +77,7 @@ freeleaps:
     freeleapsNotificationEndpoint: http://notification-service.freeleaps-alpha.svc.freeleaps.cluster:8003/api/notification/
     freeleapsDevopsEndpoint: http://devops-service.freeleaps-alpha.svc.freeleaps.cluster:8014/api
     freeleapsDeploymentEndpoint: http://devops-service.freeleaps-alpha.svc.freeleaps.cluster:8014
+    freeleapsMetricsEndpoint: http://metrics-service.freeleaps-alpha.svc.freeleaps.cluster:8009/api
     freeleapsAilabEndpoint: ''
     appEnv: alpha
     redisIsCluster: 'false'
diff --git a/freeleaps/helm-pkg/freeleaps/values.prod.yaml b/freeleaps/helm-pkg/freeleaps/values.prod.yaml
index 71f45232..de1b5040 100644
--- a/freeleaps/helm-pkg/freeleaps/values.prod.yaml
+++ b/freeleaps/helm-pkg/freeleaps/values.prod.yaml
@@ -68,6 +68,7 @@ freeleaps:
     freeleapsNotificationEndpoint: http://notification-service.freeleaps-prod.svc.freeleaps.cluster:8003/api/notification/
     freeleapsDevopsEndpoint: http://devops-service.freeleaps-prod.svc.freeleaps.cluster:8014/api
     freeleapsDeploymentEndpoint: http://devops-service.freeleaps-prod.svc.freeleaps.cluster:8014
+    freeleapsMetricsEndpoint: http://metrics-service.freeleaps-prod.svc.freeleaps.cluster:8009/api
     freeleapsAilabEndpoint: ''
     appEnv: prod
     redisIsCluster: 'true'
diff --git a/freeleaps/helm-pkg/freeleaps/values.yaml b/freeleaps/helm-pkg/freeleaps/values.yaml
index 10c6d111..8bef0814 100644
--- a/freeleaps/helm-pkg/freeleaps/values.yaml
+++ b/freeleaps/helm-pkg/freeleaps/values.yaml
@@ -89,6 +89,8 @@ freeleaps:
     freeleapsNotificationEndpoint: ""
     # FREELEAPS_AILAB_ENDPOINT
     freeleapsAilabEndpoint: ""
+    # FREELEAPS_METRICS_ENDPOINT
+    freeleapsMetricsEndpoint: ""
     # APP_ENV
     appEnv: ""
     # REDIS_IS_CLUSTER