diff --git a/helm/cert-exporter/templates/cert-manager/cert-manager.yaml b/helm/cert-exporter/templates/cert-manager/cert-manager.yaml
index 30624ff..9142b2e 100644
--- a/helm/cert-exporter/templates/cert-manager/cert-manager.yaml
+++ b/helm/cert-exporter/templates/cert-manager/cert-manager.yaml
@@ -45,12 +45,23 @@ spec:
           {{- end}}
           ports:
             - name: http
-              containerPort: 8080
+              containerPort: {{ .Values.certManager.containerPort }}
               protocol: TCP
           resources:
             {{- toYaml .Values.certManager.resources | nindent 12 }}
           volumeMounts:
            {{- toYaml .Values.certManager.volumeMounts | nindent 12 }}
+          livenessProbe:
+            tcpSocket:
+              port: {{ .Values.certManager.containerPort }}
+            initialDelaySeconds: 10
+            periodSeconds: 10
+          readinessProbe:
+            httpGet:
+              path: /metrics
+              port: {{ .Values.certManager.containerPort }}
+              failureThreshold: 1
+              periodSeconds: 10
       {{- with .Values.certManager.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
diff --git a/helm/cert-exporter/templates/cert-manager/service.yaml b/helm/cert-exporter/templates/cert-manager/service.yaml
index 5547bd9..3190f08 100644
--- a/helm/cert-exporter/templates/cert-manager/service.yaml
+++ b/helm/cert-exporter/templates/cert-manager/service.yaml
@@ -13,6 +13,6 @@ spec:
   ports:
     - port: {{ .Values.service.port }}
       name: {{ .Values.service.portName }}
-      targetPort: 8080
+      targetPort: {{ .Values.certManager.containerPort }}
   selector:
     {{ include "cert-exporter.certManagerSelectorLabels" . | nindent 6 }}
diff --git a/helm/cert-exporter/values.yaml b/helm/cert-exporter/values.yaml
index 2f090ef..944ce63 100644
--- a/helm/cert-exporter/values.yaml
+++ b/helm/cert-exporter/values.yaml
@@ -63,6 +63,8 @@ certManager:
     #   name: kubelet
     #   readOnly: true
 
+  containerPort: 8080
+
 service:
   type: ClusterIP
   port: 8080