diff --git a/charts/ocpp-csms-server/Chart.yaml b/charts/ocpp-csms-server/Chart.yaml
index 6ff9063..b97e776 100644
--- a/charts/ocpp-csms-server/Chart.yaml
+++ b/charts/ocpp-csms-server/Chart.yaml
@@ -16,7 +16,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.21
+version: 0.1.22
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/ocpp-csms-server/templates/api-deployment.yaml b/charts/ocpp-csms-server/templates/api-deployment.yaml
index ad30052..8cc8be9 100644
--- a/charts/ocpp-csms-server/templates/api-deployment.yaml
+++ b/charts/ocpp-csms-server/templates/api-deployment.yaml
@@ -56,9 +56,11 @@ spec:
             - name: "DATABASE_URL"
               value: "postgres://{{ default .Values.api.postgres.username "postgres" }}:$(DATABASE_PASSWORD)@{{ .Release.Name }}-postgresql.{{ .Release.Namespace }}.svc.cluster.local:5432/postgres"
           livenessProbe:
-            {{- toYaml .Values.api.livenessProbe | nindent 12 }}
+            grpc:
+              port: {{ .Values.api.service.port }}
           readinessProbe:
-            {{- toYaml .Values.api.readinessProbe | nindent 12 }}
+            grpc:
+              port: {{ .Values.api.service.port }}
           resources:
             {{- toYaml .Values.api.resources | nindent 12 }}
           {{- with .Values.api.volumeMounts }}
diff --git a/charts/ocpp-csms-server/templates/api-service.yaml b/charts/ocpp-csms-server/templates/api-service.yaml
index 74d1cce..18c4715 100644
--- a/charts/ocpp-csms-server/templates/api-service.yaml
+++ b/charts/ocpp-csms-server/templates/api-service.yaml
@@ -8,7 +8,7 @@ spec:
   type: {{ .Values.api.service.type }}
   ports:
     - port: {{ .Values.api.service.port }}
-      targetPort: http
+      targetPort: grpc
       protocol: TCP
       name: grpc
   selector:
diff --git a/charts/ocpp-csms-server/templates/ocpp-deployment.yaml b/charts/ocpp-csms-server/templates/ocpp-deployment.yaml
index a4815c1..2878116 100644
--- a/charts/ocpp-csms-server/templates/ocpp-deployment.yaml
+++ b/charts/ocpp-csms-server/templates/ocpp-deployment.yaml
@@ -61,9 +61,11 @@ spec:
             - name: "DATABASE_URL"
               value: "postgres://{{ default .Values.ocpp.postgres.username "postgres" }}:$(DATABASE_PASSWORD)@{{ .Release.Name }}-postgresql.{{ .Release.Namespace }}.svc.cluster.local:5432/postgres"
           livenessProbe:
-            {{- toYaml .Values.ocpp.livenessProbe | nindent 12 }}
+            grpc:
+              port: {{ .Values.ocpp.service.apiPort }}
           readinessProbe:
-            {{- toYaml .Values.ocpp.readinessProbe | nindent 12 }}
+            grpc:
+              port: {{ .Values.ocpp.service.apiPort }}
           resources:
             {{- toYaml .Values.ocpp.resources | nindent 12 }}
           {{- with .Values.ocpp.volumeMounts }}
diff --git a/charts/ocpp-csms-server/values.yaml b/charts/ocpp-csms-server/values.yaml
index 4e0bcc4..e4661ca 100644
--- a/charts/ocpp-csms-server/values.yaml
+++ b/charts/ocpp-csms-server/values.yaml
@@ -91,14 +91,6 @@ ocpp:
   #   cpu: 100m
   #   memory: 128Mi
 
-  # This is to setup the liveness and readiness probes more information can be found here: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/
-  livenessProbe:
-    grpc:
-      port: grpc
-  readinessProbe:
-    grpc:
-      port: grpc
-
   # This section is for setting up autoscaling more information can be found here: https://kubernetes.io/docs/concepts/workloads/autoscaling/
   autoscaling:
     enabled: false
@@ -191,14 +183,6 @@ api:
   #   cpu: 100m
   #   memory: 128Mi
 
-  # This is to setup the liveness and readiness probes more information can be found here: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/
-  livenessProbe:
-    grpc:
-      port: grpc
-  readinessProbe:
-    grpc:
-      port: grpc
-
   # This section is for setting up autoscaling more information can be found here: https://kubernetes.io/docs/concepts/workloads/autoscaling/
   autoscaling:
     enabled: false