diff --git a/charts/cron-job/templates/cronJob.yaml b/charts/cron-job/templates/cronJob.yaml
index 9d3f7ce..fe8f898 100644
--- a/charts/cron-job/templates/cronJob.yaml
+++ b/charts/cron-job/templates/cronJob.yaml
@@ -64,8 +64,10 @@ spec:
               {{- end }}
               imagePullPolicy: IfNotPresent
               ports:
-                - name: metrics-port
-                  containerPort: {{ .Values.metricsPort }}
+                {{- if and .Values.metricsPort (ne (int .Values.metricsPort) 0) }}
+                  - name: metrics-port
+                    containerPort: {{ .Values.metricsPort }}
+                {{- end }}
               envFrom:
                 {{- range $i, $name := .Values.envFrom.configmaps }}
                 - configMapRef:
diff --git a/charts/cron-job/templates/service.yaml b/charts/cron-job/templates/service.yaml
index c2e3f2b..71dcf54 100644
--- a/charts/cron-job/templates/service.yaml
+++ b/charts/cron-job/templates/service.yaml
@@ -9,9 +9,11 @@ spec:
     - name: http-port
       port: 80
       targetPort: {{ .Values.httpPort}}
+    {{- if and .Values.metricsPort (ne (int .Values.metricsPort) 0) }}
     - name: metrics-port
       port: 2121
-      targetPort: {{ .Values.metricsPort}}
+      targetPort: {{ .Values.metricsPort }}
+    {{- end }}
   selector:
     app: {{ .Values.name }}
   type: NodePort
diff --git a/charts/cron-job/templates/serviceMonitor.yaml b/charts/cron-job/templates/serviceMonitor.yaml
index d2e0bc6..d998b3c 100644
--- a/charts/cron-job/templates/serviceMonitor.yaml
+++ b/charts/cron-job/templates/serviceMonitor.yaml
@@ -10,7 +10,9 @@ spec:
     matchLabels:
       app: {{.Values.name}}
   endpoints:
+    {{- if .Values.metricsPort}}
     - port: metrics-port
-      interval: {{.Values.metricsScrapeInterval }}
+      interval: {{ .Values.metricsScrapeInterval }}
       path: /metrics
+    {{- end }}
 ---
\ No newline at end of file
diff --git a/charts/service/templates/deployment.yaml b/charts/service/templates/deployment.yaml
index 44eadaf..99b9c22 100644
--- a/charts/service/templates/deployment.yaml
+++ b/charts/service/templates/deployment.yaml
@@ -77,8 +77,10 @@ spec:
           ports:
             - name: http-port
               containerPort: {{ .Values.httpPort }}
+            {{- if and .Values.metricsPort (ne ( int .Values.metricsPort ) 0) }}
             - name: metrics-port
               containerPort: {{ .Values.metricsPort }}
+            {{- end }}
             {{- range $k, $v := .Values.ports}}
             - name: {{ $k }}
               containerPort: {{ $v }}
diff --git a/charts/service/templates/service.yaml b/charts/service/templates/service.yaml
index ccc10be..85e4d49 100644
--- a/charts/service/templates/service.yaml
+++ b/charts/service/templates/service.yaml
@@ -9,9 +9,11 @@ spec:
     - name: http-port
       port: 80
       targetPort: {{ .Values.httpPort}}
+    {{- if and .Values.metricsPort (ne (int .Values.metricsPort) 0) }}
     - name: metrics-port
       port: 2121
-      targetPort: {{ .Values.metricsPort}}
+      targetPort: {{ .Values.metricsPort }}
+    {{- end}}
     {{- range $k, $v := .Values.ports}}
     - name: {{ $k}}
       port: {{ $v }}
diff --git a/charts/service/templates/serviceMonitor.yaml b/charts/service/templates/serviceMonitor.yaml
index d2e0bc6..262f769 100644
--- a/charts/service/templates/serviceMonitor.yaml
+++ b/charts/service/templates/serviceMonitor.yaml
@@ -10,7 +10,9 @@ spec:
     matchLabels:
       app: {{.Values.name}}
   endpoints:
-    - port: metrics-port
-      interval: {{.Values.metricsScrapeInterval }}
-      path: /metrics
+   {{- if .Values.metricsPort}}
+  - port: metrics-port
+    interval: {{ .Values.metricsScrapeInterval }}
+    path: /metrics
+  {{- end }}
 ---
\ No newline at end of file