diff --git a/README.md b/README.md
index c4260c09..fc900379 100644
--- a/README.md
+++ b/README.md
@@ -245,6 +245,9 @@ The following table lists the global, default, and other parameters supported by
 | `default.pdb.minAvailable` | PodDistruptionBudget minAvailable | `1` |
 | `default.imagePullSecrets` | Optional list of existing Image Pull Secrets in the format of `- name: my-custom-secret` | `[]` |
 | `default.updateStrategy` | The strategy to use to update existing pods | `rollingUpdate = { maxSurge = 1, maxUnavailable = 1 }` |
+| `default.probesOverrides.timeoutSeconds` | Override the `timeoutSeconds` for every Readiness and Liveness probes. | `nil` |
+| `default.probesOverrides.successThreshold` | Override the `successThreshold` for every Readiness and Liveness probes. | `nil` |
+| `default.probesOverrides.failureThreshold` | Override the `failureThreshold` for every Readiness and Liveness probes. | `nil` |
 | `ingress.enabled` | Optional Mender Ingress | `false` |
 | `dbmigration.enable` | Helm Chart hook that trigger a DB Migration utility just before an Helm Chart install or upgrade  | `true` |
 | `device_license_count.enabled` | Device license count feature - enterprise only | `false` |
@@ -340,6 +343,11 @@ The following table lists the parameters for the `api-gateway` component and the
 | `api_gateway.certs.existingSecret` | Preexisting secret containing the Cert (key `cert.crt`) and the Key (key `private.key`) | `nil` |
 | `api_gateway.updateStrategy` | The strategy to use to update existing pods | `nil` |
 | `api_gateway.accesslogs` | Traefik Access Logs, enabled by default | `true` |
+| `api_gateway.podMonitor.enabled` | If enabled, creates a PodMonitor resource for scraping Traefik metrics | `false` |
+| `api_gateway.podMonitor.customLabels` | PodMonitor custom labels | `nil` |
+| `api_gateway.probesOverrides.timeoutSeconds` | Override the `timeoutSeconds` for every Readiness and Liveness probes. | `nil` |
+| `api_gateway.probesOverrides.successThreshold` | Override the `successThreshold` for every Readiness and Liveness probes. | `nil` |
+| `api_gateway.probesOverrides.failureThreshold` | Override the `failureThreshold` for every Readiness and Liveness probes. | `3` |
 
 ### Parameters: deployments
 
@@ -394,6 +402,9 @@ The following table lists the parameters for the `deployments` component and the
 | `deployments.migrationRestartPolicy` | Migration job: restartPolicy option | `Never` |
 | `deployments.migrationResources` | Migration job: optional K8s resources. If not specified, uses the deployment resources | `nil` |
 | `deployments.updateStrategy` | The strategy to use to update existing pods | `nil` |
+| `deployments.probesOverrides.timeoutSeconds` | Override the `timeoutSeconds` for every Readiness and Liveness probes. | `nil` |
+| `deployments.probesOverrides.successThreshold` | Override the `successThreshold` for every Readiness and Liveness probes. | `nil` |
+| `deployments.probesOverrides.failureThreshold` | Override the `failureThreshold` for every Readiness and Liveness probes. | `nil` |
 
 ### Parameters: device-auth
 
@@ -454,6 +465,9 @@ The following table lists the parameters for the `device-auth` component and the
 | `device_auth.migrationRestartPolicy` | Migration job: restartPolicy option | `Never` |
 | `device_auth.migrationResources` | Migration job: optional K8s resources. If not specified, uses the deployment resources | `nil` |
 | `device_auth.updateStrategy` | The strategy to use to update existing pods | `nil` |
+| `device_auth.probesOverrides.successThreshold` | Override the `successThreshold` for every Readiness and Liveness probes. | `nil` |
+| `device_auth.probesOverrides.timeoutSeconds` | Override the `timeoutSeconds` for every Readiness and Liveness probes. | `nil` |
+| `device_auth.probesOverrides.failureThreshold` | Override the `failureThreshold` for every Readiness and Liveness probes. | `nil` |
 
 ### Parameters: gui
 
@@ -492,6 +506,9 @@ The following table lists the parameters for the `gui` component and their defau
 | `gui.containerSecurityContext.runAsUser` | User ID for the container | `65534` |
 | `gui.priorityClassName` | Optional pre-existing priorityClassName to be assigned to the resource | `nil` |
 | `gui.updateStrategy` | The strategy to use to update existing pods | `nil` |
+| `gui.probesOverrides.successThreshold` | Override the `successThreshold` for every Readiness and Liveness probes. | `nil` |
+| `gui.probesOverrides.timeoutSeconds` | Override the `timeoutSeconds` for every Readiness and Liveness probes. | `nil` |
+| `gui.probesOverrides.failureThreshold` | Override the `failureThreshold` for every Readiness and Liveness probes. | `nil` |
 
 ### Parameters: inventory
 
@@ -543,6 +560,9 @@ The following table lists the parameters for the `inventory` component and their
 | `inventory.migrationResources` | Migration job: optional K8s resources. If not specified, uses the deployment resources | `nil` |
 | `inventory.updateStrategy` | The strategy to use to update existing pods | `nil` |
 | `inventory.mongodbExistingSecret` | Use a different MongoDB secret for this service | `nil` |
+| `inventory.probesOverrides.successThreshold` | Override the `successThreshold` for every Readiness and Liveness probes. | `nil` |
+| `inventory.probesOverrides.timeoutSeconds` | Override the `timeoutSeconds` for every Readiness and Liveness probes. | `nil` |
+| `inventory.probesOverrides.failureThreshold` | Override the `failureThreshold` for every Readiness and Liveness probes. | `nil` |
 
 ### Parameters: reporting
 
@@ -626,6 +646,9 @@ The following table lists the parameters for the `tenantadm` component and their
 | `tenantadm.migrationResources` | Migration job: optional K8s resources. If not specified, uses the deployment resources | `nil` |
 | `tenantadm.migrationArgs` | Migration job: optional migration args (list). | `["migrate"]` |
 | `tenantadm.updateStrategy` | The strategy to use to update existing pods | `nil` |
+| `tenantadm.probesOverrides.successThreshold` | Override the `successThreshold` for every Readiness and Liveness probes. | `nil` |
+| `tenantadm.probesOverrides.timeoutSeconds` | Override the `timeoutSeconds` for every Readiness and Liveness probes. | `nil` |
+| `tenantadm.probesOverrides.failureThreshold` | Override the `failureThreshold` for every Readiness and Liveness probes. | `nil` |
 
 The default value for the rate limits are:
 
@@ -696,6 +719,9 @@ The following table lists the parameters for the `useradm` component and their d
 | `useradm.migrationRestartPolicy` | Migration job: restartPolicy option | `Never` |
 | `useradm.migrationResources` | Migration job: optional K8s resources. If not specified, uses the deployment resources | `nil` |
 | `useradm.updateStrategy` | The strategy to use to update existing pods | `nil` |
+| `useradm.probesOverrides.successThreshold` | Override the `successThreshold` for every Readiness and Liveness probes. | `nil` |
+| `useradm.probesOverrides.timeoutSeconds` | Override the `timeoutSeconds` for every Readiness and Liveness probes. | `nil` |
+| `useradm.probesOverrides.failureThreshold` | Override the `failureThreshold` for every Readiness and Liveness probes. | `nil` |
 
 ### Parameters: workflows
 
@@ -736,6 +762,9 @@ The following table lists the parameters for the `workflows-server` component an
 | `workflows.migrationResources` | Migration job: optional K8s resources. If not specified, uses the deployment resources | `nil` |
 | `workflows.updateStrategy` | The strategy to use to update existing pods | `nil` |
 | `workflows.mountSecrets` | Optional `volumeMounts` and `volumes` to inject a credential files in the workflows service  | `nil` |
+| `workflows.probesOverrides.successThreshold` | Override the `successThreshold` for every Readiness and Liveness probes. | `nil` |
+| `workflows.probesOverrides.timeoutSeconds` | Override the `timeoutSeconds` for every Readiness and Liveness probes. | `nil` |
+| `workflows.probesOverrides.failureThreshold` | Override the `failureThreshold` for every Readiness and Liveness probes. | `nil` |
 
 ### Parameters: create_artifact_worker
 
@@ -812,6 +841,9 @@ The following table lists the parameters for the `auditlogs` component and their
 | `auditlogs.migrationRestartPolicy` | Migration job: restartPolicy option | `Never` |
 | `auditlogs.migrationResources` | Migration job: optional K8s resources. If not specified, uses the deployment resources | `nil` |
 | `auditlogs.updateStrategy` | The strategy to use to update existing pods | `nil` |
+| `auditlogs.probesOverrides.successThreshold` | Override the `successThreshold` for every Readiness and Liveness probes. | `nil` |
+| `auditlogs.probesOverrides.timeoutSeconds` | Override the `timeoutSeconds` for every Readiness and Liveness probes. | `nil` |
+| `auditlogs.probesOverrides.failureThreshold` | Override the `failureThreshold` for every Readiness and Liveness probes. | `nil` |
 
 ### Parameters: iot-manager
 
@@ -858,6 +890,9 @@ The following table lists the parameters for the `iot-manager` component and the
 | `iot_manager.migrationResources` | Migration job: optional K8s resources. If not specified, uses the deployment resources | `nil` |
 | `iot_manager.updateStrategy` | The strategy to use to update existing pods | `nil` |
 | `iot_manager.aesEncryptionKey.existingSecret` | Optional secret containing the AES encryption key. The secret key must be `AES_ENCRYPTION_KEY` | `nil` |
+| `iot_manager.probesOverrides.successThreshold` | Override the `successThreshold` for every Readiness and Liveness probes. | `nil` |
+| `iot_manager.probesOverrides.timeoutSeconds` | Override the `timeoutSeconds` for every Readiness and Liveness probes. | `nil` |
+| `iot_manager.probesOverrides.failureThreshold` | Override the `failureThreshold` for every Readiness and Liveness probes. | `nil` |
 
 ### Parameters: deviceconnect
 
@@ -905,6 +940,9 @@ The following table lists the parameters for the `deviceconnect` component and t
 | `deviceconnect.migrationRestartPolicy` | Migration job: restartPolicy option | `Never` |
 | `deviceconnect.migrationResources` | Migration job: optional K8s resources. If not specified, uses the deployment resources | `nil` |
 | `deviceconnect.updateStrategy` | The strategy to use to update existing pods | `nil` |
+| `deviceconnect.probesOverrides.successThreshold` | Override the `successThreshold` for every Readiness and Liveness probes. | `nil` |
+| `deviceconnect.probesOverrides.timeoutSeconds` | Override the `timeoutSeconds` for every Readiness and Liveness probes. | `nil` |
+| `deviceconnect.probesOverrides.failureThreshold` | Override the `failureThreshold` for every Readiness and Liveness probes. | `nil` |
 
 ### Parameters: deviceconfig
 
@@ -950,6 +988,9 @@ The following table lists the parameters for the `deviceconfig` component and th
 | `deviceconfig.migrationRestartPolicy` | Migration job: restartPolicy option | `Never` |
 | `deviceconfig.migrationResources` | Migration job: optional K8s resources. If not specified, uses the deployment resources | `nil` |
 | `deviceconfig.updateStrategy` | The strategy to use to update existing pods | `nil` |
+| `deviceconfig.probesOverrides.successThreshold` | Override the `successThreshold` for every Readiness and Liveness probes. | `nil` |
+| `deviceconfig.probesOverrides.timeoutSeconds` | Override the `timeoutSeconds` for every Readiness and Liveness probes. | `nil` |
+| `deviceconfig.probesOverrides.failureThreshold` | Override the `failureThreshold` for every Readiness and Liveness probes. | `nil` |
 
 ### Parameters: devicemonitor
 
@@ -997,6 +1038,9 @@ The following table lists the parameters for the `devicemonitor` component and t
 | `devicemonitor.migrationRestartPolicy` | Migration job: restartPolicy option | `Never` |
 | `devicemonitor.migrationResources` | Migration job: optional K8s resources. If not specified, uses the deployment resources | `nil` |
 | `devicemonitor.updateStrategy` | The strategy to use to update existing pods | `nil` |
+| `devicemonitor.probesOverrides.successThreshold` | Override the `successThreshold` for every Readiness and Liveness probes. | `nil` |
+| `devicemonitor.probesOverrides.timeoutSeconds` | Override the `timeoutSeconds` for every Readiness and Liveness probes. | `nil` |
+| `devicemonitor.probesOverrides.failureThreshold` | Override the `failureThreshold` for every Readiness and Liveness probes. | `nil` |
 
 ### Parameters: generate_delta_worker
 Please notice that this feature is still under active development and it is
diff --git a/mender/CHANGELOG.md b/mender/CHANGELOG.md
index 87448311..57cf8135 100644
--- a/mender/CHANGELOG.md
+++ b/mender/CHANGELOG.md
@@ -7,6 +7,11 @@
 * Move from megabytes to mebibytes for consistency.
 * Added `inventory.mongodbExistingSecret` to override the default MongoDB secret.
 * Not using `HAVE_ENTERPRISE` when in hosted mode.
+* Added `podMonitor` resource for monitoring the `api-gateway` service (Traefik metrics).
+* Allow overriding fullname (thanks @ignatiusreza)
+* Removed unused `mender.name` function.
+* Added `probesOverrides` to override the default timeout for readiness and liveness probes.
+* Fix naming problem in templates using api_gateway and NodePort (thanks @j-rivero)
 
 ## Version 5.6.2
 * Upgrade to Mender version `3.7.4`.
diff --git a/mender/templates/_helpers.tpl b/mender/templates/_helpers.tpl
index 9de08e96..5b6f64bf 100644
--- a/mender/templates/_helpers.tpl
+++ b/mender/templates/_helpers.tpl
@@ -1,10 +1,4 @@
 {{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "mender.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
-{{- end }}
 
 {{/*
 Create a default fully qualified app name.
@@ -330,3 +324,14 @@ Storage Proxy Rule
 {{- define "mender.storageProxyRule" -}}
   {{- default "HostRegexp(`{domain:^artifacts.*$}`)" .Values.api_gateway.storage_proxy.customRule | quote }}
 {{- end -}}
+
+{{/*
+Use custom probes overrides
+*/}}
+{{- define "mender.probesOverrides" -}}
+{{- $_ := dict }}
+{{- $_ := (mergeOverwrite $_ .default .override) }}
+{{- if $_ }}
+{{- toYaml $_ }}
+{{- end }}
+{{- end }}
diff --git a/mender/templates/api-gateway/deployment.yaml b/mender/templates/api-gateway/deployment.yaml
index 7e3efc32..15066c0c 100644
--- a/mender/templates/api-gateway/deployment.yaml
+++ b/mender/templates/api-gateway/deployment.yaml
@@ -88,6 +88,9 @@ spec:
             - --providers.file.filename=/etc/traefik/config/traefik.yaml
             - --ping=true
             - --ping.manualrouting=true
+            {{- if .Values.api_gateway.podMonitor.enabled }}
+            - --entryPoints.metrics.address=:9090
+            {{- end }}
 {{- if .Values.api_gateway.extraArgs }}
 {{- .Values.api_gateway.extraArgs | toYaml | nindent 12 }}
 {{- end }}
@@ -99,24 +102,33 @@ spec:
         - containerPort: {{ .Values.api_gateway.httpsPort }}
 {{- end }}
         - containerPort: {{ .Values.api_gateway.httpPort }}
+{{- if .Values.api_gateway.podMonitor.enabled }}
+        - containerPort: 9090
+          name: prom-metrics
+          protocol: TCP
+{{- end }}
 
         # Readiness/liveness/startup probes
         livenessProbe:
           tcpSocket:
-          failureThreshold: 3
           httpGet:
             path: /healthz
             port: {{ .Values.api_gateway.httpPort }}
           initialDelaySeconds: 5
           periodSeconds: 5
+          {{- with include "mender.probesOverrides" (dict "default" .Values.default.probesOverrides "override" .Values.api_gateway.probesOverrides ) }}
+          {{- nindent 10 . }}
+          {{- end }}
         readinessProbe:
           tcpSocket:
-          failureThreshold: 1
           httpGet:
             path: /healthz
             port: {{ .Values.api_gateway.httpPort }}
           periodSeconds: 15
           initialDelaySeconds: 5
+          {{- with include "mender.probesOverrides" (dict "default" .Values.default.probesOverrides "override" .Values.api_gateway.probesOverrides ) }}
+          {{- nindent 10 . }}
+          {{- end }}
         startupProbe:
           failureThreshold: 30
           httpGet:
diff --git a/mender/templates/api-gateway/podMonitor.yaml b/mender/templates/api-gateway/podMonitor.yaml
new file mode 100644
index 00000000..5a319e1f
--- /dev/null
+++ b/mender/templates/api-gateway/podMonitor.yaml
@@ -0,0 +1,15 @@
+{{- if .Values.api_gateway.podMonitor.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: PodMonitor
+metadata:
+  name: {{ include "mender.fullname" . }}-api-gateway
+  labels:
+    {{- include "mender.labels" . | nindent 4 }}
+    {{- toYaml .Values.api_gateway.podMonitor.customLabels | nindent 4 }}
+spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: {{ include "mender.fullname" . }}-api-gateway
+  podMetricsEndpoints:
+  - port: prom-metrics
+{{- end }}
diff --git a/mender/templates/auditlogs/_podtemplate.yaml b/mender/templates/auditlogs/_podtemplate.yaml
index 2dde6cb1..a30fa8bb 100644
--- a/mender/templates/auditlogs/_podtemplate.yaml
+++ b/mender/templates/auditlogs/_podtemplate.yaml
@@ -51,11 +51,17 @@ spec:
         path: /api/internal/v1/auditlogs/health
         port: 8080
       periodSeconds: 15
+      {{- with include "mender.probesOverrides" (dict "default" .dot.Values.default.probesOverrides "override" .dot.Values.auditlogs.probesOverrides ) }}
+      {{- nindent 6 . }}
+      {{- end }}
     livenessProbe:
       httpGet:
         path: /api/internal/v1/auditlogs/alive
         port: 8080
       periodSeconds: 5
+      {{- with include "mender.probesOverrides" (dict "default" .dot.Values.default.probesOverrides "override" .dot.Values.auditlogs.probesOverrides ) }}
+      {{- nindent 6 . }}
+      {{- end }}
     startupProbe:
       httpGet:
         path: /api/internal/v1/auditlogs/alive
diff --git a/mender/templates/deployments/_podtemplate.yaml b/mender/templates/deployments/_podtemplate.yaml
index 578521a9..2ea43cc0 100644
--- a/mender/templates/deployments/_podtemplate.yaml
+++ b/mender/templates/deployments/_podtemplate.yaml
@@ -59,11 +59,17 @@ spec:
         path: /api/internal/v1/deployments/health
         port: 8080
       periodSeconds: 15
+      {{- with include "mender.probesOverrides" (dict "default" .dot.Values.default.probesOverrides "override" .dot.Values.deployments.probesOverrides ) }}
+      {{- nindent 6 . }}
+      {{- end }}
     livenessProbe:
       httpGet:
         path: /api/internal/v1/deployments/alive
         port: 8080
       periodSeconds: 5
+      {{- with include "mender.probesOverrides" (dict "default" .dot.Values.default.probesOverrides "override" .dot.Values.deployments.probesOverrides ) }}
+      {{- nindent 6 . }}
+      {{- end }}
     startupProbe:
       httpGet:
         path: /api/internal/v1/deployments/alive
diff --git a/mender/templates/device-auth/_podtemplate.yaml b/mender/templates/device-auth/_podtemplate.yaml
index ffd82084..8bcd5c16 100644
--- a/mender/templates/device-auth/_podtemplate.yaml
+++ b/mender/templates/device-auth/_podtemplate.yaml
@@ -58,11 +58,17 @@ spec:
         path: /api/internal/v1/devauth/health
         port: 8080
       periodSeconds: 15
+      {{- with include "mender.probesOverrides" (dict "default" .dot.Values.default.probesOverrides "override" .dot.Values.device_auth.probesOverrides ) }}
+      {{- nindent 6 . }}
+      {{- end }}
     livenessProbe:
       httpGet:
         path: /api/internal/v1/devauth/alive
         port: 8080
       periodSeconds: 5
+      {{- with include "mender.probesOverrides" (dict "default" .dot.Values.default.probesOverrides "override" .dot.Values.device_auth.probesOverrides ) }}
+      {{- nindent 6 . }}
+      {{- end }}
     startupProbe:
       httpGet:
         path: /api/internal/v1/devauth/alive
diff --git a/mender/templates/deviceconfig/_podtemplate.yaml b/mender/templates/deviceconfig/_podtemplate.yaml
index 8d294a44..8b82f373 100644
--- a/mender/templates/deviceconfig/_podtemplate.yaml
+++ b/mender/templates/deviceconfig/_podtemplate.yaml
@@ -52,11 +52,17 @@ spec:
         path: /api/internal/v1/deviceconfig/health
         port: 8080
       periodSeconds: 15
+      {{- with include "mender.probesOverrides" (dict "default" .dot.Values.default.probesOverrides "override" .dot.Values.deviceconfig.probesOverrides ) }}
+      {{- nindent 6 . }}
+      {{- end }}
     livenessProbe:
       httpGet:
         path: /api/internal/v1/deviceconfig/alive
         port: 8080
       periodSeconds: 5
+      {{- with include "mender.probesOverrides" (dict "default" .dot.Values.default.probesOverrides "override" .dot.Values.deviceconfig.probesOverrides ) }}
+      {{- nindent 6 . }}
+      {{- end }}
     startupProbe:
       httpGet:
         path: /api/internal/v1/deviceconfig/alive
diff --git a/mender/templates/deviceconnect/_podtemplate.yaml b/mender/templates/deviceconnect/_podtemplate.yaml
index a01a0d75..06bfc67e 100644
--- a/mender/templates/deviceconnect/_podtemplate.yaml
+++ b/mender/templates/deviceconnect/_podtemplate.yaml
@@ -51,11 +51,17 @@ spec:
         path: /api/internal/v1/deviceconnect/health
         port: 8080
       periodSeconds: 15
+      {{- with include "mender.probesOverrides" (dict "default" .dot.Values.default.probesOverrides "override" .dot.Values.deviceconnect.probesOverrides ) }}
+      {{- nindent 6 . }}
+      {{- end }}
     livenessProbe:
       httpGet:
         path: /api/internal/v1/deviceconnect/alive
         port: 8080
       periodSeconds: 5
+      {{- with include "mender.probesOverrides" (dict "default" .dot.Values.default.probesOverrides "override" .dot.Values.deviceconnect.probesOverrides ) }}
+      {{- nindent 6 . }}
+      {{- end }}
     startupProbe:
       httpGet:
         path: /api/internal/v1/deviceconnect/alive
diff --git a/mender/templates/devicemonitor/_podtemplate.yaml b/mender/templates/devicemonitor/_podtemplate.yaml
index f45d496e..4da10f8c 100644
--- a/mender/templates/devicemonitor/_podtemplate.yaml
+++ b/mender/templates/devicemonitor/_podtemplate.yaml
@@ -51,11 +51,17 @@ spec:
         path: /api/internal/v1/devicemonitor/health
         port: 8080
       periodSeconds: 15
+      {{- with include "mender.probesOverrides" (dict "default" .dot.Values.default.probesOverrides "override" .dot.Values.devicemonitor.probesOverrides ) }}
+      {{- nindent 6 . }}
+      {{- end }}
     livenessProbe:
       httpGet:
         path: /api/internal/v1/devicemonitor/alive
         port: 8080
       periodSeconds: 5
+      {{- with include "mender.probesOverrides" (dict "default" .dot.Values.default.probesOverrides "override" .dot.Values.devicemonitor.probesOverrides ) }}
+      {{- nindent 6 . }}
+      {{- end }}
     startupProbe:
       httpGet:
         path: /api/internal/v1/devicemonitor/alive
diff --git a/mender/templates/gui/deployment.yaml b/mender/templates/gui/deployment.yaml
index c18f97dd..9a300283 100644
--- a/mender/templates/gui/deployment.yaml
+++ b/mender/templates/gui/deployment.yaml
@@ -63,10 +63,16 @@ spec:
           tcpSocket:
             port: {{ .Values.gui.httpPort }}
           periodSeconds: 5
+          {{- with include "mender.probesOverrides" (dict "default" .Values.default.probesOverrides "override" .Values.gui.probesOverrides ) }}
+          {{- nindent 10 . }}
+          {{- end }}
         readinessProbe:
           tcpSocket:
             port: {{ .Values.gui.httpPort }}
           periodSeconds: 15
+          {{- with include "mender.probesOverrides" (dict "default" .Values.default.probesOverrides "override" .Values.gui.probesOverrides ) }}
+          {{- nindent 10 . }}
+          {{- end }}
 
         env:
         {{- if .Values.global.hosted }}
diff --git a/mender/templates/inventory/_podtemplate.yaml b/mender/templates/inventory/_podtemplate.yaml
index 0613f194..1eeafb37 100644
--- a/mender/templates/inventory/_podtemplate.yaml
+++ b/mender/templates/inventory/_podtemplate.yaml
@@ -58,11 +58,17 @@ spec:
         path: /api/internal/v1/inventory/health
         port: 8080
       periodSeconds: 15
+      {{- with include "mender.probesOverrides" (dict "default" .dot.Values.default.probesOverrides "override" .dot.Values.inventory.probesOverrides ) }}
+      {{- nindent 6 . }}
+      {{- end }}
     livenessProbe:
       httpGet:
         path: /api/internal/v1/inventory/alive
         port: 8080
       periodSeconds: 5
+      {{- with include "mender.probesOverrides" (dict "default" .dot.Values.default.probesOverrides "override" .dot.Values.inventory.probesOverrides ) }}
+      {{- nindent 6 . }}
+      {{- end }}
     startupProbe:
       httpGet:
         path: /api/internal/v1/inventory/alive
diff --git a/mender/templates/iot-manager/_podtemplate.yaml b/mender/templates/iot-manager/_podtemplate.yaml
index 9d51537c..db3591de 100644
--- a/mender/templates/iot-manager/_podtemplate.yaml
+++ b/mender/templates/iot-manager/_podtemplate.yaml
@@ -51,11 +51,17 @@ spec:
         path: /api/internal/v1/iot-manager/health
         port: 8080
       periodSeconds: 15
+      {{- with include "mender.probesOverrides" (dict "default" .dot.Values.default.probesOverrides "override" .dot.Values.iot_manager.probesOverrides ) }}
+      {{- nindent 6 . }}
+      {{- end }}
     livenessProbe:
       httpGet:
         path: /api/internal/v1/iot-manager/alive
         port: 8080
       periodSeconds: 5
+      {{- with include "mender.probesOverrides" (dict "default" .dot.Values.default.probesOverrides "override" .dot.Values.iot_manager.probesOverrides ) }}
+      {{- nindent 6 . }}
+      {{- end }}
     startupProbe:
       httpGet:
         path: /api/internal/v1/iot-manager/alive
diff --git a/mender/templates/tenantadm/_podtemplate.yaml b/mender/templates/tenantadm/_podtemplate.yaml
index 067a949a..cde602c2 100644
--- a/mender/templates/tenantadm/_podtemplate.yaml
+++ b/mender/templates/tenantadm/_podtemplate.yaml
@@ -47,11 +47,17 @@ spec:
         path: /api/internal/v1/tenantadm/health
         port: 8080
       periodSeconds: 15
+      {{- with include "mender.probesOverrides" (dict "default" .dot.Values.default.probesOverrides "override" .dot.Values.tenantadm.probesOverrides ) }}
+      {{- nindent 6 . }}
+      {{- end }}
     livenessProbe:
       httpGet:
         path: /api/internal/v1/tenantadm/alive
         port: 8080
       periodSeconds: 5
+      {{- with include "mender.probesOverrides" (dict "default" .dot.Values.default.probesOverrides "override" .dot.Values.tenantadm.probesOverrides ) }}
+      {{- nindent 6 . }}
+      {{- end }}
     startupProbe:
       httpGet:
         path: /api/internal/v1/tenantadm/alive
diff --git a/mender/templates/useradm/_podtemplate.yaml b/mender/templates/useradm/_podtemplate.yaml
index 16f63e5a..32743b23 100644
--- a/mender/templates/useradm/_podtemplate.yaml
+++ b/mender/templates/useradm/_podtemplate.yaml
@@ -56,11 +56,17 @@ spec:
         path: /api/internal/v1/useradm/health
         port: 8080
       periodSeconds: 15
+      {{- with include "mender.probesOverrides" (dict "default" .dot.Values.default.probesOverrides "override" .dot.Values.useradm.probesOverrides ) }}
+      {{- nindent 6 . }}
+      {{- end }}
     livenessProbe:
       httpGet:
         path: /api/internal/v1/useradm/alive
         port: 8080
       periodSeconds: 5
+      {{- with include "mender.probesOverrides" (dict "default" .dot.Values.default.probesOverrides "override" .dot.Values.useradm.probesOverrides ) }}
+      {{- nindent 6 . }}
+      {{- end }}
     startupProbe:
       httpGet:
         path: /api/internal/v1/useradm/alive
diff --git a/mender/templates/workflows/_podtemplate.yaml b/mender/templates/workflows/_podtemplate.yaml
index b424d22c..43b44ec4 100644
--- a/mender/templates/workflows/_podtemplate.yaml
+++ b/mender/templates/workflows/_podtemplate.yaml
@@ -61,11 +61,17 @@ spec:
         path: /api/v1/health
         port: 8080
       periodSeconds: 15
+      {{- with include "mender.probesOverrides" (dict "default" .dot.Values.default.probesOverrides "override" .dot.Values.workflows.probesOverrides ) }}
+      {{- nindent 6 . }}
+      {{- end }}
     livenessProbe:
       httpGet:
         path: /status
         port: 8080
       periodSeconds: 5
+      {{- with include "mender.probesOverrides" (dict "default" .dot.Values.default.probesOverrides "override" .dot.Values.workflows.probesOverrides ) }}
+      {{- nindent 6 . }}
+      {{- end }}
     startupProbe:
       httpGet:
         path: /status
diff --git a/mender/values.yaml b/mender/values.yaml
index 9f559e69..9b5ae967 100644
--- a/mender/values.yaml
+++ b/mender/values.yaml
@@ -94,6 +94,12 @@ default:
       maxSurge: 1
       maxUnavailable: 1
 
+  # Override the properties of the Readiness and Liveness probes
+  probesOverrides: {}
+    # timeoutSeconds: 1
+    # successThreshold: 1
+    # failureThreshold: 3
+
 
 serviceAccount:
   create: false
@@ -274,6 +280,18 @@ api_gateway:
   #     maxSurge: 25%
   #     maxUnavailable: 25%
 
+  # prometheus pod monitor
+  podMonitor:
+    enabled: false
+    customLabels: {}
+      # prometheus-operated: "true"
+
+  # Override the properties of the Readiness, Liveness and Startup probes
+  probesOverrides:
+    # timeoutSeconds: 2
+    # successThreshold: 2
+    failureThreshold: 3
+
 deployments:
   enabled: true
   podAnnotations: {}
@@ -347,6 +365,12 @@ deployments:
   #     maxSurge: 25%
   #     maxUnavailable: 25%
 
+  # Override the properties of the Readiness, Liveness and Startup probes
+  probesOverrides: {}
+    # timeoutSeconds: 2
+    # successThreshold: 2
+    # failureThreshold: 6
+
 device_auth:
   enabled: true
   podAnnotations: {}
@@ -427,6 +451,12 @@ device_auth:
   #     maxSurge: 25%
   #     maxUnavailable: 25%
 
+  # Override the properties of the Readiness, Liveness and Startup probes
+  probesOverrides: {}
+    # timeoutSeconds: 2
+    # successThreshold: 2
+    # failureThreshold: 6
+
 # Generate Delta Worker feature
 # Experimental feature, still in beta
 # will be released in the next Mender versions
@@ -510,6 +540,12 @@ gui:
   #     maxSurge: 25%
   #     maxUnavailable: 25%
 
+  # Override the properties of the Readiness, Liveness and Startup probes
+  probesOverrides: {}
+    # timeoutSeconds: 2
+    # successThreshold: 2
+    # failureThreshold: 6
+
 inventory:
   enabled: true
   podAnnotations: {}
@@ -577,6 +613,12 @@ inventory:
   # - name: LOG_LEVEL
   #   value: DEBUG
 
+  # Override the properties of the Readiness, Liveness and Startup probes
+  probesOverrides: {}
+    # timeoutSeconds: 2
+    # successThreshold: 2
+    # failureThreshold: 6
+
 tenantadm:
   enabled: true
   podAnnotations: {}
@@ -657,6 +699,12 @@ tenantadm:
   #     maxSurge: 25%
   #     maxUnavailable: 25%
 
+  # Override the properties of the Readiness, Liveness and Startup probes
+  probesOverrides: {}
+    # timeoutSeconds: 2
+    # successThreshold: 2
+    # failureThreshold: 6
+
 useradm:
   enabled: true
   podAnnotations: {}
@@ -737,6 +785,12 @@ useradm:
   #     maxSurge: 25%
   #     maxUnavailable: 25%
 
+  # Override the properties of the Readiness, Liveness and Startup probes
+  probesOverrides: {}
+    # timeoutSeconds: 2
+    # successThreshold: 2
+    # failureThreshold: 6
+
 workflows:
   enabled: true
   podAnnotations: {}
@@ -813,6 +867,12 @@ workflows:
   #       defaultMode: 420
   #       secretName: my-credential-file
 
+  # Override the properties of the Readiness, Liveness and Startup probes
+  probesOverrides: {}
+    # timeoutSeconds: 2
+    # successThreshold: 2
+    # failureThreshold: 6
+
 
 create_artifact_worker:
   enabled: true
@@ -922,6 +982,12 @@ auditlogs:
   #     maxSurge: 25%
   #     maxUnavailable: 25%
 
+  # Override the properties of the Readiness, Liveness and Startup probes
+  probesOverrides: {}
+    # timeoutSeconds: 2
+    # successThreshold: 2
+    # failureThreshold: 6
+
 iot_manager:
   enabled: true
   podAnnotations: {}
@@ -991,6 +1057,12 @@ iot_manager:
   aesEncryptionKey:
     existingSecret: ""
 
+  # Override the properties of the Readiness, Liveness and Startup probes
+  probesOverrides: {}
+    # timeoutSeconds: 2
+    # successThreshold: 2
+    # failureThreshold: 6
+
 deviceconnect:
   enabled: true
   podAnnotations: {}
@@ -1057,6 +1129,12 @@ deviceconnect:
   #     maxSurge: 25%
   #     maxUnavailable: 25%
 
+  # Override the properties of the Readiness, Liveness and Startup probes
+  probesOverrides: {}
+    # timeoutSeconds: 2
+    # successThreshold: 2
+    # failureThreshold: 6
+
 deviceconfig:
   enabled: true
   podAnnotations: {}
@@ -1121,6 +1199,12 @@ deviceconfig:
   #     maxSurge: 25%
   #     maxUnavailable: 25%
 
+  # Override the properties of the Readiness, Liveness and Startup probes
+  probesOverrides: {}
+    # timeoutSeconds: 2
+    # successThreshold: 2
+    # failureThreshold: 6
+
 devicemonitor:
   enabled: true
   podAnnotations: {}
@@ -1188,6 +1272,12 @@ devicemonitor:
   #     maxSurge: 25%
   #     maxUnavailable: 25%
 
+  # Override the properties of the Readiness, Liveness and Startup probes
+  probesOverrides: {}
+    # timeoutSeconds: 2
+    # successThreshold: 2
+    # failureThreshold: 6
+
 # Redis as a subchart
 # Using a bitnami sub-chart by default = test usage only
 # It's recommended to use a suitable Redis Cluster for Production