diff --git a/charts/kah-common/Chart.lock b/charts/kah-common/Chart.lock
deleted file mode 100644
index 19acb29cf..000000000
--- a/charts/kah-common/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
-  repository: https://library-charts.k8s-at-home.com
-  version: 4.4.2
-digest: sha256:188739ba8be7390f6f7d3d601c1ac51627c6237f2c4d94e68c3378a3cc69367e
-generated: "2022-05-09T06:26:02.309438799Z"
diff --git a/charts/kah-common/Chart.yaml b/charts/kah-common/Chart.yaml
deleted file mode 100644
index 9c7a543a6..000000000
--- a/charts/kah-common/Chart.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-apiVersion: v2
-description: A KaH-common powered chart template
-name: kah-common
-version: 1.0.0
-maintainers:
-  - name: bjw-s
-    email: me@bjw-s.dev
-dependencies:
-  - name: common
-    repository: https://library-charts.k8s-at-home.com
-    version: 4.4.2
diff --git a/charts/kah-common/charts/common-4.4.2.tgz b/charts/kah-common/charts/common-4.4.2.tgz
deleted file mode 100644
index 6df0b0181..000000000
Binary files a/charts/kah-common/charts/common-4.4.2.tgz and /dev/null differ
diff --git a/charts/kah-common/templates/common.yaml b/charts/kah-common/templates/common.yaml
deleted file mode 100644
index a6613c2ce..000000000
--- a/charts/kah-common/templates/common.yaml
+++ /dev/null
@@ -1 +0,0 @@
-{{ include "common.all" . }}
diff --git a/cluster/apps/home-automation/emqx/helm-release.yaml b/cluster/apps/home-automation/emqx/helm-release.yaml
index b63266dc2..25523efab 100644
--- a/cluster/apps/home-automation/emqx/helm-release.yaml
+++ b/cluster/apps/home-automation/emqx/helm-release.yaml
@@ -10,13 +10,16 @@ spec:
     spec:
       # renovate: registryUrl=https://repos.emqx.io/charts
       chart: emqx
-      version: 4.4.5
+      version: 5.0.3
       sourceRef:
         kind: HelmRepository
         name: emqx-charts
         namespace: flux-system
       interval: 5m
   values:
+    image:
+      repository: public.ecr.aws/emqx/emqx
+
     replicaCount: 3
     recreatePods: true
 
@@ -27,28 +30,6 @@ spec:
       EMQX_AUTH__USER__1__USERNAME: "${SECRET_MQTT_USERNAME}"
       EMQX_AUTH__USER__1__PASSWORD: "${SECRET_MQTT_PASSWORD}"
 
-    emqxAclConfig: >
-      {allow, {user, "dashboard"}, subscribe, ["$SYS/#"]}.
-      {allow, {ipaddr, "127.0.0.1"}, pubsub, ["$SYS/#", "#"]}.
-      {allow, all, subscribe, ["$SYS/#", {eq, "#"}]}.
-      {allow, all}.
-    emqxLoadedPlugins: >
-      {emqx_management, true}.
-      {emqx_recon, true}.
-      {emqx_retainer, true}.
-      {emqx_dashboard, true}.
-      {emqx_telemetry, false}.
-      {emqx_rule_engine, true}.
-      {emqx_bridge_mqtt, false}.
-      {emqx_auth_mnesia, true}.
-      {emqx_prometheus, true}.
-    emqxLoadedModules: >
-      {emqx_mod_presence, true}.
-      {emqx_mod_delayed, false}.
-      {emqx_mod_rewrite, false}.
-      {emqx_mod_subscription, false}.
-      {emqx_mod_topic_metrics, true}.
-
     service:
       annotations:
         prometheus.io/probe: "true"