diff --git a/charts/incubator/netbox/Chart.yaml b/charts/incubator/netbox/Chart.yaml
index fcc7ed86da4..a6bc9a6025a 100644
--- a/charts/incubator/netbox/Chart.yaml
+++ b/charts/incubator/netbox/Chart.yaml
@@ -27,7 +27,7 @@ name: netbox
 sources:
   - https://github.com/truecharts/charts/tree/master/charts/incubator/netbox
   - https://github.com/netbox-community/netbox-docker
-version: 3.0.12
+version: 3.0.13
 annotations:
   truecharts.org/catagories: |
     - network
diff --git a/charts/incubator/netbox/templates/_housekeeper.tpl b/charts/incubator/netbox/templates/_housekeeper.tpl
index 43edc3ea6ab..a3e62392a57 100644
--- a/charts/incubator/netbox/templates/_housekeeper.tpl
+++ b/charts/incubator/netbox/templates/_housekeeper.tpl
@@ -30,4 +30,37 @@ volumeMounts:
   - name: configfile
     mountPath: /etc/netbox/config/01-config.py
     subPath: config.py
+readinessProbe:
+  exec:
+    command:
+      - /bin/bash
+      - -c
+      - |
+        ps -aux | grep -v grep | grep -q housekeeping || exit 1
+  initialDelaySeconds: {{ .Values.probes.readiness.spec.initialDelaySeconds }}
+  timeoutSeconds: {{ .Values.probes.readiness.spec.timeoutSeconds }}
+  periodSeconds: {{ .Values.probes.readiness.spec.periodSeconds }}
+  failureThreshold: {{ .Values.probes.readiness.spec.failureThreshold }}
+livenessProbe:
+  exec:
+    command:
+      - /bin/bash
+      - -c
+      - |
+        ps -aux | grep -v grep | grep -q housekeeping || exit 1
+  initialDelaySeconds: {{ .Values.probes.liveness.spec.initialDelaySeconds }}
+  timeoutSeconds: {{ .Values.probes.liveness.spec.timeoutSeconds }}
+  periodSeconds: {{ .Values.probes.liveness.spec.periodSeconds }}
+  failureThreshold: {{ .Values.probes.liveness.spec.failureThreshold }}
+startupProbe:
+  exec:
+    command:
+      - /bin/bash
+      - -c
+      - |
+        ps -aux | grep -v grep | grep -q housekeeping || exit 1
+  initialDelaySeconds: {{ .Values.probes.startup.spec.initialDelaySeconds }}
+  timeoutSeconds: {{ .Values.probes.startup.spec.timeoutSeconds }}
+  periodSeconds: {{ .Values.probes.startup.spec.periodSeconds }}
+  failureThreshold: {{ .Values.probes.startup.spec.failureThreshold }}
 {{- end -}}
diff --git a/charts/incubator/netbox/templates/_worker.tpl b/charts/incubator/netbox/templates/_worker.tpl
index 41ff2f01b72..d13563653d3 100644
--- a/charts/incubator/netbox/templates/_worker.tpl
+++ b/charts/incubator/netbox/templates/_worker.tpl
@@ -29,10 +29,13 @@ volumeMounts:
   - name: configfile
     mountPath: /etc/netbox/config/01-config.py
     subPath: config.py
-{{/*readinessProbe:
+readinessProbe:
   exec:
     command:
-      - TODO: find a healthcheck
+      - /bin/bash
+      - -c
+      - |
+        ps -aux | grep -v grep | grep -q rqworker || exit 1
   initialDelaySeconds: {{ .Values.probes.readiness.spec.initialDelaySeconds }}
   timeoutSeconds: {{ .Values.probes.readiness.spec.timeoutSeconds }}
   periodSeconds: {{ .Values.probes.readiness.spec.periodSeconds }}
@@ -40,7 +43,10 @@ volumeMounts:
 livenessProbe:
   exec:
     command:
-      - TODO: find a healthcheck
+      - /bin/bash
+      - -c
+      - |
+        ps -aux | grep -v grep | grep -q rqworker || exit 1
   initialDelaySeconds: {{ .Values.probes.liveness.spec.initialDelaySeconds }}
   timeoutSeconds: {{ .Values.probes.liveness.spec.timeoutSeconds }}
   periodSeconds: {{ .Values.probes.liveness.spec.periodSeconds }}
@@ -48,9 +54,12 @@ livenessProbe:
 startupProbe:
   exec:
     command:
-      - TODO: find a healthcheck
+      - /bin/bash
+      - -c
+      - |
+        ps -aux | grep -v grep | grep -q rqworker || exit 1
   initialDelaySeconds: {{ .Values.probes.startup.spec.initialDelaySeconds }}
   timeoutSeconds: {{ .Values.probes.startup.spec.timeoutSeconds }}
   periodSeconds: {{ .Values.probes.startup.spec.periodSeconds }}
-  failureThreshold: {{ .Values.probes.startup.spec.failureThreshold }}*/}}
+  failureThreshold: {{ .Values.probes.startup.spec.failureThreshold }}
 {{- end -}}
diff --git a/charts/incubator/netbox/values.yaml b/charts/incubator/netbox/values.yaml
index 5d14e4cf7ec..e0c97f796fd 100644
--- a/charts/incubator/netbox/values.yaml
+++ b/charts/incubator/netbox/values.yaml
@@ -14,13 +14,13 @@ podSecurityContext:
 probes:
   liveness:
     type: HTTP
-    path: /login
+    path: /api
   readiness:
     type: HTTP
-    path: /login
+    path: /api
   startup:
     type: HTTP
-    path: /login
+    path: /api
     # Gives some time for app to run db migrations
     initialDelaySeconds: 60
 
diff --git a/charts/stable/immich/Chart.yaml b/charts/stable/immich/Chart.yaml
index a6709a5af2e..695508f1299 100644
--- a/charts/stable/immich/Chart.yaml
+++ b/charts/stable/immich/Chart.yaml
@@ -26,7 +26,7 @@ name: immich
 sources:
   - https://github.com/truecharts/charts/tree/master/charts/stable/immich
   - https://github.com/immich-app/immich
-version: 4.0.11
+version: 4.0.12
 annotations:
   truecharts.org/catagories: |
     - media
diff --git a/charts/stable/immich/templates/_ml.tpl b/charts/stable/immich/templates/_ml.tpl
index 7ebe7dd10f8..b18416353a4 100644
--- a/charts/stable/immich/templates/_ml.tpl
+++ b/charts/stable/immich/templates/_ml.tpl
@@ -1,7 +1,11 @@
 {{/* Define the ml container */}}
 {{- define "immich.ml" -}}
-image: {{ .Values.imageML.repository }}:{{ .Values.imageML.tag }}
-imagePullPolicy: {{ .Values.imageML.pullPolicy }}
+  {{- if hasKey .Values "imageML" -}} {{/* For smooth upgrade, Remove later*/}}
+    {{- $img := .Values.imageML -}}
+    {{- $_ := set .Values "mlImage" (dict "repository" $img.repository "tag" $img.tag "pullPolicy" $img.pullPolicy) -}}
+  {{- end }}
+image: {{ .Values.mlImage.repository }}:{{ .Values.mlImage.tag }}
+imagePullPolicy: {{ .Values.mlImage.pullPolicy }}
 securityContext:
   runAsUser: {{ .Values.podSecurityContext.runAsUser }}
   runAsGroup: {{ .Values.podSecurityContext.runAsGroup }}
diff --git a/charts/stable/immich/templates/_proxy.tpl b/charts/stable/immich/templates/_proxy.tpl
index dcad750fda9..5bda1f49690 100644
--- a/charts/stable/immich/templates/_proxy.tpl
+++ b/charts/stable/immich/templates/_proxy.tpl
@@ -1,7 +1,11 @@
 {{/* Define the proxy container */}}
 {{- define "immich.proxy" -}}
-image: {{ .Values.imageProxy.repository }}:{{ .Values.imageProxy.tag }}
-imagePullPolicy: {{ .Values.imageProxy.pullPolicy }}
+  {{- if hasKey .Values "imageProxy" -}} {{/* For smooth upgrade, Remove later */}}
+    {{- $img := .Values.imageProxy -}}
+    {{- $_ := set .Values "proxyImage" (dict "repository" $img.repository "tag" $img.tag "pullPolicy" $img.pullPolicy) -}}
+  {{- end }}
+image: {{ .Values.proxyImage.repository }}:{{ .Values.proxyImage.tag }}
+imagePullPolicy: {{ .Values.proxyImage.pullPolicy }}
 securityContext:
   runAsUser: {{ .Values.podSecurityContext.runAsUser }}
   runAsGroup: {{ .Values.podSecurityContext.runAsGroup }}
diff --git a/charts/stable/immich/templates/_web.tpl b/charts/stable/immich/templates/_web.tpl
index 1d5ec7d8140..ca421761f73 100644
--- a/charts/stable/immich/templates/_web.tpl
+++ b/charts/stable/immich/templates/_web.tpl
@@ -1,7 +1,11 @@
 {{/* Define the web container */}}
 {{- define "immich.web" -}}
-image: {{ .Values.imageWeb.repository }}:{{ .Values.imageWeb.tag }}
-imagePullPolicy: {{ .Values.imageWeb.pullPolicy }}
+  {{- if hasKey .Values "imageWeb" -}} {{/* For smooth upgrade, Remove later */}}
+    {{- $img := .Values.imageWeb -}}
+    {{- $_ := set .Values "webImage" (dict "repository" $img.repository "tag" $img.tag "pullPolicy" $img.pullPolicy) -}}
+  {{- end }}
+image: {{ .Values.webImage.repository }}:{{ .Values.webImage.tag }}
+imagePullPolicy: {{ .Values.webImage.pullPolicy }}
 securityContext:
   runAsUser: {{ .Values.podSecurityContext.runAsUser }}
   runAsGroup: {{ .Values.podSecurityContext.runAsGroup }}
diff --git a/charts/stable/immich/values.yaml b/charts/stable/immich/values.yaml
index 31c43ea9b52..852ebdba059 100644
--- a/charts/stable/immich/values.yaml
+++ b/charts/stable/immich/values.yaml
@@ -3,17 +3,17 @@ image:
   tag: 1.38.2_60@sha256:d1a67c3bd732f8b3fbf6f334b17d053f867ada27cbcbf2e55647dd782abf86e8
   pullPolicy: IfNotPresent
 
-imageML:
+mlImage:
   repository: tccr.io/truecharts/immich-ml
   tag: 1.29.5_44@sha256:2df7b6368beb52ff1ffd946aaacc4df21f278b97ee3c592e2021118b3dcb5fec
   pullPolicy: IfNotPresent
 
-imageWeb:
+webImage:
   repository: tccr.io/truecharts/immich-web
   tag: 1.29.5_44@sha256:c17ec4c2a174bac8fc2c58ebaedc7db70600fa2480695cf0920d54127c8bb32e
   pullPolicy: IfNotPresent
 
-imageProxy:
+proxyImage:
   repository: tccr.io/truecharts/immich-proxy
   tag: 1.29.5_44@sha256:a4c24a70cc1e1bbbdecc3df371af08528430846709ef22ca16e2a923aa8da509
   pullPolicy: IfNotPresent