diff --git a/charts/netbox/Chart.yaml b/charts/netbox/Chart.yaml
index 130d662..b9c8b7c 100644
--- a/charts/netbox/Chart.yaml
+++ b/charts/netbox/Chart.yaml
@@ -4,22 +4,22 @@ name: netbox
 description: |
   An IP address management (IPAM) and data center infrastructure management (DCIM) tool.
 
-  Important; With chart version 3.0.0 the old nginx+gunicorn setup is no more, refer to
-  https://github.com/netbox-community/netbox-docker/releases/tag/1.0.0 for more info.
+  Important; With chart version 4.0.0 there are major upgrades to the packaged Redis and Postgres,
+  as well as a major version bump of Netbox that introduces housekeeping. Take care when upgrading.
 icon: https://raw.githubusercontent.com/digitalocean/netbox/develop/netbox/project-static/img/netbox.ico
-appVersion: 2.11.12
+appVersion: 3.0.7
 
 type: application
-version: 3.0.12
+version: 4.0.0
 maintainers:
   - name: Alexander Olofsson
     email: ace@haxalot.com
 
 dependencies:
   - name: postgresql
-    version: ~8.9.4
+    version: '> 8, < 11'
     repository: https://charts.bitnami.com/bitnami
     condition: postgresql.enabled
   - name: redis
-    version: ~10.6.12
+    version: ~15
     repository: https://charts.bitnami.com/bitnami
diff --git a/charts/netbox/templates/configuration.yaml b/charts/netbox/templates/configuration.yaml
index fc1a0b8..62cdd7a 100644
--- a/charts/netbox/templates/configuration.yaml
+++ b/charts/netbox/templates/configuration.yaml
@@ -15,7 +15,7 @@ data:
   DB_PORT: {{ .Values.postgresql.postgresqlPort | default 5432 | quote }}
 
   REDIS_HOST: {{ include "netbox.redisHost" . }}
-  REDIS_PORT: {{ .Values.redis.redisPort | quote }}
+  REDIS_PORT: {{ .Values.redis.master.service.port | default 6379 | quote }}
   REDIS_SSL: "false"
 
 {{- if .Values.superuser.name }}
diff --git a/charts/netbox/templates/deployment-housekeeping.yaml b/charts/netbox/templates/deployment-housekeeping.yaml
index 9a8d06f..d0c3424 100644
--- a/charts/netbox/templates/deployment-housekeeping.yaml
+++ b/charts/netbox/templates/deployment-housekeeping.yaml
@@ -1,4 +1,4 @@
-{{- if or .Values.housekeeping.enabled (semverCompare ">3.0.0" (include "netbox.imageTag" .)) -}}
+{{- if .Values.housekeeping.enabled -}}
 ---
 apiVersion: apps/v1
 kind: Deployment
diff --git a/charts/netbox/templates/deployment.yaml b/charts/netbox/templates/deployment.yaml
index cf06abf..ff4a4b0 100644
--- a/charts/netbox/templates/deployment.yaml
+++ b/charts/netbox/templates/deployment.yaml
@@ -39,13 +39,11 @@ spec:
           image: "{{ .Values.image.repository }}:{{ include "netbox.imageTag" . }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
-          {{- if .Values.redis.usePassword }}
             - name: REDIS_PASSWORD
               valueFrom:
                 secretKeyRef:
                   name: {{ include "netbox.redis.fullname" . }}
                   key: redis-password
-          {{- end }}
           {{- if .Values.existingDjangoSecret }}
             - name: SECRET_KEY
               valueFrom:
@@ -74,22 +72,26 @@ spec:
             - name: http
               containerPort: 8080
               protocol: TCP
+          {{- with .Values.livenessProbe }}
           livenessProbe:
-            httpGet:
-              port: http
-              path: /
+            {{ toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.readinessProbe }}
           readinessProbe:
-            httpGet:
-              port: http
-              path: /
+            {{ toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.startupProbe }}
+          readinessProbe:
+            {{ toYaml . | nindent 12 }}
+          {{- end }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           volumeMounts:
             - name: data
               mountPath: /etc/netbox/media
-            {{- with .Values.extraVolumeMounts }}
+          {{- with .Values.extraVolumeMounts }}
             {{ toYaml . | nindent 12 }}
-            {{- end }}
+          {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
@@ -105,9 +107,9 @@ spec:
       {{- else }}
           emptyDir: {}
       {{- end }}
-{{- if .Values.extraVolumes }}
-{{ toYaml .Values.extraVolumes | indent 8 }}
-{{- end }}
+      {{- if .Values.extraVolumes }}
+        {{ toYaml .Values.extraVolumes | nindent 8 }}
+      {{- end }}
     {{- with .Values.affinity }}
       affinity:
         {{- toYaml . | nindent 8 }}
diff --git a/charts/netbox/values.yaml b/charts/netbox/values.yaml
index 50ea44f..6a1bbdd 100644
--- a/charts/netbox/values.yaml
+++ b/charts/netbox/values.yaml
@@ -52,16 +52,16 @@ postgresql:
   # existingSecretKey: postgresql-password
 
 redis:
-  cluster:
-    enabled: false
+  architecture: standalone
+  auth:
+    enabled: true
+    # password: netbox
+
   master:
     persistence:
       enabled: false
-  slave:
-    persistence:
-      enabled: false
-  # password: netbox
-  redisPort: 6379
+    service:
+      port: 6379
 
 # NB; Not specifying a key or existing secret will cause it to regenerate on
 # every upgrade
@@ -139,9 +139,9 @@ worker:
   affinity: {}
 
 housekeeping:
-  ## Netbox 3.0.0 and upwards need housekeeping to be ran, if you're not using
-  ## a versioned tag then you may need to set this parameter
-  # enabled: true
+  ## Netbox 3.0.0 and upwards need a housekeeping pod, if you're not using
+  ## 3.0 then you may need to set this parameter
+  enabled: true
 
   resources: {}
     # limits: