diff --git a/charts/kubezero-addons/values.yaml b/charts/kubezero-addons/values.yaml
index 0390f48f..aee6132d 100644
--- a/charts/kubezero-addons/values.yaml
+++ b/charts/kubezero-addons/values.yaml
@@ -26,6 +26,9 @@ aws-node-termination-handler:
 
   fullnameOverride: "aws-node-termination-handler"
 
+  image:
+    tag: v1.14.1
+
   # -- "aws-node-termination-handler/${ClusterName}"
   managedAsgTag: "aws-node-termination-handler/managed"
 
diff --git a/charts/kubezero-argocd/Chart.yaml b/charts/kubezero-argocd/Chart.yaml
index 5ff65551..5b996935 100644
--- a/charts/kubezero-argocd/Chart.yaml
+++ b/charts/kubezero-argocd/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: KubeZero ArgoCD Helm chart to install ArgoCD itself and the KubeZero ArgoCD Application
 name: kubezero-argocd
-version: 0.9.4
+version: 0.9.5
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
 keywords:
@@ -16,10 +16,6 @@ dependencies:
     version: ">= 0.1.4"
     repository: https://cdn.zero-downtime.net/charts/
   - name: argo-cd
-    version: 3.29.5
+    version: 3.32.1
     repository: https://argoproj.github.io/argo-helm
-  - name: argocd-applicationset
-    version: 1.4.0
-    repository: https://argoproj.github.io/argo-helm
-    condition: argocd-applicationset.enabled
 kubeVersion: ">= 1.20.0"
diff --git a/charts/kubezero-argocd/README.md b/charts/kubezero-argocd/README.md
index 8f442fb0..b5327738 100644
--- a/charts/kubezero-argocd/README.md
+++ b/charts/kubezero-argocd/README.md
@@ -1,6 +1,6 @@
 # kubezero-argocd
 
-![Version: 0.9.4](https://img.shields.io/badge/Version-0.9.4-informational?style=flat-square)
+![Version: 0.9.5](https://img.shields.io/badge/Version-0.9.5-informational?style=flat-square)
 
 KubeZero ArgoCD Helm chart to install ArgoCD itself and the KubeZero ArgoCD Application
 
@@ -18,8 +18,7 @@ Kubernetes: `>= 1.20.0`
 
 | Repository | Name | Version |
 |------------|------|---------|
-| https://argoproj.github.io/argo-helm | argo-cd | 3.29.5 |
-| https://argoproj.github.io/argo-helm | argocd-applicationset | 1.4.0 |
+| https://argoproj.github.io/argo-helm | argo-cd | 3.32.1 |
 | https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.4 |
 
 ## Values
@@ -49,11 +48,6 @@ Kubernetes: `>= 1.20.0`
 | argo-cd.server.metrics.enabled | bool | `false` |  |
 | argo-cd.server.metrics.serviceMonitor.enabled | bool | `true` |  |
 | argo-cd.server.service.servicePortHttpsName | string | `"grpc"` |  |
-| argocd-applicationset.args.policy | string | `"create-update"` |  |
-| argocd-applicationset.enabled | bool | `false` |  |
-| argocd-applicationset.rbac.pspEnabled | bool | `false` |  |
-| argocd-applicationset.resources.requests.cpu | string | `"50m"` |  |
-| argocd-applicationset.resources.requests.memory | string | `"64Mi"` |  |
 | istio.enabled | bool | `false` | Deploy Istio VirtualService to expose ArgoCD |
 | istio.gateway | string | `"istio-ingress/ingressgateway"` | Name of the Istio gateway to add the VirtualService to |
 | istio.ipBlocks | list | `[]` |  |
diff --git a/charts/kubezero-argocd/values.yaml b/charts/kubezero-argocd/values.yaml
index 34b6a8a7..bc9d26b4 100644
--- a/charts/kubezero-argocd/values.yaml
+++ b/charts/kubezero-argocd/values.yaml
@@ -116,22 +116,3 @@ argo-cd:
 
   dex:
     enabled: false
-
-
-argocd-applicationset:
-  enabled: false
-
-  # Prevent accidental cascading deletes of Applications
-  args:
-    policy: create-update
-
-  rbac:
-    pspEnabled: false
-
-  resources:
-    # limits:
-      # cpu: 500m
-      # memory: 2048Mi
-    requests:
-      cpu: 50m
-      memory: 64Mi
diff --git a/charts/kubezero-storage/Chart.yaml b/charts/kubezero-storage/Chart.yaml
index c29a11e0..3f9c4aa5 100644
--- a/charts/kubezero-storage/Chart.yaml
+++ b/charts/kubezero-storage/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: kubezero-storage
 description: KubeZero umbrella chart for all things storage incl. AWS EBS/EFS, openEBS-lvm, gemini
 type: application
-version: 0.5.3
+version: 0.5.4
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
 keywords:
@@ -32,7 +32,7 @@ dependencies:
     condition: aws-ebs-csi-driver.enabled
     # repository: https://kubernetes-sigs.github.io/aws-ebs-csi-driver
   - name: aws-efs-csi-driver
-    version: 2.2.1
+    version: 2.2.3
     condition: aws-efs-csi-driver.enabled
     # repository: https://kubernetes-sigs.github.io/aws-ebs-csi-driver
 kubeVersion: ">= 1.20.0"
diff --git a/charts/kubezero-storage/README.md b/charts/kubezero-storage/README.md
index 8f8135b4..bc5b5e27 100644
--- a/charts/kubezero-storage/README.md
+++ b/charts/kubezero-storage/README.md
@@ -19,7 +19,7 @@ Kubernetes: `>= 1.20.0`
 | Repository | Name | Version |
 |------------|------|---------|
 |  | aws-ebs-csi-driver | 2.6.2 |
-|  | aws-efs-csi-driver | 2.2.1 |
+|  | aws-efs-csi-driver | 2.2.3 |
 |  | gemini | 0.0.8 |
 |  | lvm-localpv | 0.8.6 |
 | https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.4 |
diff --git a/charts/kubezero-storage/charts/aws-efs-csi-driver/CHANGELOG.md b/charts/kubezero-storage/charts/aws-efs-csi-driver/CHANGELOG.md
index 5ca8fdca..f734ad90 100644
--- a/charts/kubezero-storage/charts/aws-efs-csi-driver/CHANGELOG.md
+++ b/charts/kubezero-storage/charts/aws-efs-csi-driver/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Helm chart
 
+# v2.2.3
+* Bump app/driver version to `v1.3.6`
+
+# v2.2.2
+* Add controller.volMetricsOptIn for emitting volume metrics
+* Update ECR sidecars to 1-18-13
+
 # v2.2.1
 * Bump app/driver version to `v1.3.5`
 
diff --git a/charts/kubezero-storage/charts/aws-efs-csi-driver/Chart.yaml b/charts/kubezero-storage/charts/aws-efs-csi-driver/Chart.yaml
index 69918570..3cb5c615 100644
--- a/charts/kubezero-storage/charts/aws-efs-csi-driver/Chart.yaml
+++ b/charts/kubezero-storage/charts/aws-efs-csi-driver/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 1.3.5
+appVersion: 1.3.6
 description: A Helm chart for AWS EFS CSI Driver
 home: https://github.com/kubernetes-sigs/aws-efs-csi-driver
 keywords:
@@ -15,4 +15,4 @@ maintainers:
 name: aws-efs-csi-driver
 sources:
 - https://github.com/kubernetes-sigs/aws-efs-csi-driver
-version: 2.2.1
+version: 2.2.3
diff --git a/charts/kubezero-storage/charts/aws-efs-csi-driver/values.yaml b/charts/kubezero-storage/charts/aws-efs-csi-driver/values.yaml
index b923b600..4e0c0cea 100644
--- a/charts/kubezero-storage/charts/aws-efs-csi-driver/values.yaml
+++ b/charts/kubezero-storage/charts/aws-efs-csi-driver/values.yaml
@@ -9,7 +9,7 @@ replicaCount: 2
 
 image:
   repository: amazon/aws-efs-csi-driver
-  tag: "v1.3.5"
+  tag: "v1.3.6"
   pullPolicy: IfNotPresent
 
 sidecars:
diff --git a/charts/kubezero/Chart.yaml b/charts/kubezero/Chart.yaml
index 129cf191..17386ffd 100644
--- a/charts/kubezero/Chart.yaml
+++ b/charts/kubezero/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: kubezero
 description: KubeZero - Root App of Apps chart
 type: application
-version: 1.21.9
+version: 1.21.9-1
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
 keywords:
diff --git a/charts/kubezero/README.md b/charts/kubezero/README.md
index f5a1bfa8..dd1ef559 100644
--- a/charts/kubezero/README.md
+++ b/charts/kubezero/README.md
@@ -1,6 +1,6 @@
 # kubezero
 
-![Version: 1.21.8](https://img.shields.io/badge/Version-1.21.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 1.21.9](https://img.shields.io/badge/Version-1.21.9-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 KubeZero - Root App of Apps chart
 
@@ -26,11 +26,11 @@ Kubernetes: `>= 1.20.0`
 |-----|------|---------|-------------|
 | HighAvailableControlplane | bool | `false` |  |
 | addons.enabled | bool | `false` |  |
-| addons.targetRevision | string | `"0.1.0"` |  |
+| addons.targetRevision | string | `"0.2.4"` |  |
 | argocd.enabled | bool | `false` |  |
 | argocd.istio.enabled | bool | `false` |  |
 | argocd.namespace | string | `"argocd"` |  |
-| argocd.targetRevision | string | `"0.9.0"` |  |
+| argocd.targetRevision | string | `"0.9.4"` |  |
 | cert-manager.enabled | bool | `false` |  |
 | cert-manager.namespace | string | `"cert-manager"` |  |
 | cert-manager.targetRevision | string | `"0.8.0"` |  |
@@ -48,17 +48,19 @@ Kubernetes: `>= 1.20.0`
 | kubezero.server | string | `"https://kubernetes.default.svc"` |  |
 | logging.enabled | bool | `false` |  |
 | logging.namespace | string | `"logging"` |  |
-| logging.targetRevision | string | `"0.7.16"` |  |
+| logging.targetRevision | string | `"0.7.17"` |  |
 | metrics.enabled | bool | `false` |  |
 | metrics.istio.grafana | object | `{}` |  |
 | metrics.istio.prometheus | object | `{}` |  |
 | metrics.namespace | string | `"monitoring"` |  |
-| metrics.targetRevision | string | `"0.6.1"` |  |
+| metrics.targetRevision | string | `"0.7.4"` |  |
 | network.enabled | bool | `false` |  |
 | network.retain | bool | `true` |  |
 | network.targetRevision | string | `"0.1.0"` |  |
+| storage.aws-ebs-csi-driver.enabled | bool | `false` |  |
+| storage.aws-efs-csi-driver.enabled | bool | `false` |  |
 | storage.enabled | bool | `false` |  |
-| storage.targetRevision | string | `"0.4.3"` |  |
+| storage.targetRevision | string | `"0.5.2"` |  |
 
 ----------------------------------------------
 Autogenerated from chart metadata using [helm-docs v1.5.0](https://github.com/norwoodj/helm-docs/releases/v1.5.0)
diff --git a/charts/kubezero/values.yaml b/charts/kubezero/values.yaml
index 976f5228..2f9f104a 100644
--- a/charts/kubezero/values.yaml
+++ b/charts/kubezero/values.yaml
@@ -8,7 +8,7 @@ HighAvailableControlplane: false
 
 addons:
   enabled: false
-  targetRevision: 0.2.4
+  targetRevision: 0.4.1
 
 network:
   enabled: false
@@ -27,7 +27,7 @@ kiam:
 
 storage:
   enabled: false
-  targetRevision: 0.5.2
+  targetRevision: 0.5.4
   aws-ebs-csi-driver:
     enabled: false
   aws-efs-csi-driver:
@@ -59,6 +59,6 @@ logging:
 argocd:
   enabled: false
   namespace: argocd
-  targetRevision: 0.9.4
+  targetRevision: 0.9.5
   istio:
     enabled: false
diff --git a/containers/admin/v1.21/kubezero.sh b/containers/admin/v1.21/kubezero.sh
index a874131b..6950ef4e 100755
--- a/containers/admin/v1.21/kubezero.sh
+++ b/containers/admin/v1.21/kubezero.sh
@@ -11,7 +11,7 @@ export WORKDIR=/tmp/kubezero
 export HOSTFS=/host
 export VERSION=v1.21
 export NETWORK_VERSION=0.1.7
-export ADDONS_VERSION=0.4.1
+export ADDONS_VERSION=0.4.2
 
 export KUBECONFIG="${HOSTFS}/root/.kube/config"
 
@@ -142,6 +142,9 @@ if [ "$1" == 'upgrade' ]; then
   fi
 
   ### POST 1.21 specific
+  # Delete any previous aws-node-term config as they changed the labels ;-(
+  kubectl delete deployment aws-node-termination-handler -n kube-system || true
+  
   ######################
   helm repo add kubezero https://cdn.zero-downtime.net/charts/
 
@@ -236,8 +239,10 @@ elif [[ "$1" =~ "^(bootstrap|recover|join)$" ]]; then
     _kubeadm init phase kubeconfig all
     _kubeadm init phase kubelet-start
 
-    # first get current running etcd pods for etcdctl commands
-    # retry in case other nodes join / API fails / etcd leader changes etc.
+    # flush etcd data directory from restore
+    rm -rf ${HOSTFS}/var/lib/etcd/member
+
+    # get current running etcd pods for etcdctl commands
     while true; do
       etcd_endpoints=$(kubectl get pods -n kube-system -l component=etcd -o yaml | \
         yq eval '.items[].metadata.annotations."kubeadm.kubernetes.io/etcd.advertise-client-urls"' - | tr '\n' ',' | sed -e 's/,$//')
diff --git a/containers/admin/v1.21/migrate_argo.sh b/containers/admin/v1.21/migrate_argo.sh
index 8465a3a2..f4f0eb79 100755
--- a/containers/admin/v1.21/migrate_argo.sh
+++ b/containers/admin/v1.21/migrate_argo.sh
@@ -5,7 +5,7 @@ YAML=$1
 # Convert keys
 yq eval -i '
   .spec.source.repoURL="https://cdn.zero-downtime.net/charts" |
-  .spec.source.targetRevision="1.21.8-7" |
+  .spec.source.targetRevision="1.21.9-1" |
   del(.spec.source.helm.parameters)' $YAML
 
 # Extract values