diff --git a/charts/helm/checkmate/templates/client-deployment.yaml b/charts/helm/checkmate/templates/client-deployment.yaml
index a5d487dc8..381631ef5 100644
--- a/charts/helm/checkmate/templates/client-deployment.yaml
+++ b/charts/helm/checkmate/templates/client-deployment.yaml
@@ -12,6 +12,14 @@ spec:
       labels:
         app: checkmate-client
     spec:
+    {{- with .Values.client.affinity }}
+      affinity:
+        {{- tpl ( . | toYaml) $ | nindent 8 }}
+    {{- end }}
+    {{- with .Values.client.tolerations }}
+      tolerations:
+        {{- tpl ( . | toYaml) $ | nindent 8 }}
+    {{- end }}
       containers:
         - name: client
           image: {{ .Values.client.image }}
@@ -21,11 +29,15 @@ spec:
             - name: UPTIME_APP_API_BASE_URL
               value: "{{ .Values.server.protocol }}://{{ .Values.server.ingress.host }}/api/v1"
             - name: UPTIME_APP_CLIENT_HOST
-              value: "http://{{ .Values.client.ingress.host }}"
+              value: "{{ .Values.client.protocol }}://{{ .Values.client.ingress.host }}"
           volumeMounts:
             - name: config-volume
               mountPath: /etc/nginx/conf.d/default.conf
               subPath: default.conf
+          {{- with .Values.client.resources }}
+          resources:
+              {{- tpl ( . | toYaml) $ | nindent 12 }}
+          {{- end }}
       volumes:
         - name: config-volume
           configMap:
diff --git a/charts/helm/checkmate/templates/mongodb-statefulsets.yaml b/charts/helm/checkmate/templates/mongodb-statefulsets.yaml
index 1ffd1c228..f849e4e21 100644
--- a/charts/helm/checkmate/templates/mongodb-statefulsets.yaml
+++ b/charts/helm/checkmate/templates/mongodb-statefulsets.yaml
@@ -12,6 +12,14 @@ spec:
       labels:
         app: checkmate-mongodb
     spec:
+    {{- with .Values.mongodb.affinity }}
+      affinity:
+        {{- tpl ( . | toYaml) $ | nindent 8 }}
+    {{- end }}
+    {{- with .Values.mongodb.tolerations }}
+      tolerations:
+        {{- tpl ( . | toYaml) $ | nindent 8 }}
+    {{- end }}
       containers:
         - name: mongodb
           image: {{ .Values.mongodb.image }}
@@ -21,6 +29,10 @@ spec:
           volumeMounts:
             - name: checkmate-mongo-persistent-storage
               mountPath: /data/db
+          {{- with .Values.mongodb.resources }}
+          resources:
+              {{- tpl ( . | toYaml) $ | nindent 12 }}
+          {{- end }}
   volumeClaimTemplates:
     - metadata:
         name: checkmate-mongo-persistent-storage
diff --git a/charts/helm/checkmate/templates/server-deployment.yaml b/charts/helm/checkmate/templates/server-deployment.yaml
index 8c9403916..393964ccd 100644
--- a/charts/helm/checkmate/templates/server-deployment.yaml
+++ b/charts/helm/checkmate/templates/server-deployment.yaml
@@ -12,6 +12,14 @@ spec:
       labels:
         app: checkmate-server
     spec:
+    {{- with .Values.server.affinity }}
+      affinity:
+        {{- tpl ( . | toYaml) $ | nindent 8 }}
+    {{- end }}
+    {{- with .Values.server.tolerations }}
+      tolerations:
+        {{- tpl ( . | toYaml) $ | nindent 8 }}
+    {{- end }}
       containers:
         - name: server
           image: {{ .Values.server.image }}
@@ -20,6 +28,10 @@ spec:
           envFrom:
             - secretRef:
                 name: checkmate-secrets
+          {{- with .Values.server.resources }}
+          resources:
+              {{- tpl ( . | toYaml) $ | nindent 12 }}
+          {{- end }}
           env:
           - name: CLIENT_HOST
-            value: "http://{{ .Values.client.ingress.host }}"
+            value: "{{ .Values.client.protocol }}://{{ .Values.client.ingress.host }}"
diff --git a/charts/helm/checkmate/templates/server-ingress.yaml b/charts/helm/checkmate/templates/server-ingress.yaml
index 0d7ca867b..6e2d0d4d6 100644
--- a/charts/helm/checkmate/templates/server-ingress.yaml
+++ b/charts/helm/checkmate/templates/server-ingress.yaml
@@ -22,7 +22,7 @@ spec:
     - host: {{ .Values.server.ingress.host }}
       http:
         paths:
-          - path: /
+          - path: /api/v1
             pathType: Prefix
             backend:
               service:
diff --git a/charts/helm/checkmate/values.yaml b/charts/helm/checkmate/values.yaml
index 1840cf909..0ba0051f8 100644
--- a/charts/helm/checkmate/values.yaml
+++ b/charts/helm/checkmate/values.yaml
@@ -1,6 +1,7 @@
 client:
   image: ghcr.io/bluewave-labs/checkmate-client:v3.2.0
   port: 80
+  protocol: http
   ingress:
     enabled: true
     host: change_me