diff --git a/admin/kubezero.sh b/admin/kubezero.sh
index 98a313d1..96bc8ce0 100755
--- a/admin/kubezero.sh
+++ b/admin/kubezero.sh
@@ -148,10 +148,8 @@ kubeadm_upgrade() {
 
   post_kubeadm
 
-  # If we have a re-cert kubectl config install for root
-  if [ -f ${HOSTFS}/etc/kubernetes/super-admin.conf ]; then
-    cp ${HOSTFS}/etc/kubernetes/super-admin.conf ${HOSTFS}/root/.kube/config
-  fi
+  # install re-certed kubectl config for root
+  cp ${HOSTFS}/etc/kubernetes/super-admin.conf ${HOSTFS}/root/.kube/config
 
   # post upgrade hook
   [ -f /var/lib/kubezero/post-upgrade.sh ] && . /var/lib/kubezero/post-upgrade.sh
@@ -260,7 +258,12 @@ control_plane_node() {
 
   _kubeadm init phase kubelet-start
 
-  cp ${HOSTFS}/etc/kubernetes/super-admin.conf ${HOSTFS}/root/.kube/config
+  # Remove conditional with 1.30
+  if [ -f ${HOSTFS}/etc/kubernetes/super-admin.conf ]; then
+    cp ${HOSTFS}/etc/kubernetes/super-admin.conf ${HOSTFS}/root/.kube/config
+  else
+    cp ${HOSTFS}/etc/kubernetes/admin.conf ${HOSTFS}/root/.kube/config
+  fi
 
   # Wait for api to be online
   echo "Waiting for Kubernetes API to be online ..."
@@ -306,7 +309,7 @@ control_plane_node() {
 
   post_kubeadm
 
-  echo "${1} cluster $CLUSTERNAME successfull."
+  echo "${CMD}ed cluster $CLUSTERNAME successfully."
 }
 
 
@@ -364,7 +367,9 @@ backup() {
   # pki & cluster-admin access
   cp -r ${HOSTFS}/etc/kubernetes/pki ${WORKDIR}
   cp ${HOSTFS}/etc/kubernetes/admin.conf ${WORKDIR}
-  cp ${HOSTFS}/etc/kubernetes/super-admin.conf ${WORKDIR}
+
+  # Remove conditional with 1.30
+  [ -f ${HOSTFS}/etc/kubernetes/super-admin.conf ] && cp ${HOSTFS}/etc/kubernetes/super-admin.conf ${WORKDIR}
 
   # Backup via restic
   restic backup ${WORKDIR} -H $CLUSTERNAME --tag $CLUSTER_VERSION
diff --git a/charts/kubezero-logging/templates/eck/secrets.yaml b/charts/kubezero-logging/templates/eck/secrets.yaml
index 04b9e604..bd09d6f4 100644
--- a/charts/kubezero-logging/templates/eck/secrets.yaml
+++ b/charts/kubezero-logging/templates/eck/secrets.yaml
@@ -6,10 +6,9 @@ metadata:
   labels:
     common.k8s.elastic.co/type: elasticsearch
     elasticsearch.k8s.elastic.co/cluster-name: {{ template "kubezero-lib.fullname" $ }}
+    {{ include "kubezero-lib.labels" . | nindent 4 }}
   name: {{ template "kubezero-lib.fullname" $ }}-es-elastic-user
   namespace: {{ .Release.Namespace }}
-  labels:
-{{ include "kubezero-lib.labels" . | indent 4 }}
 data:
   elastic: {{ .Values.elastic_password | b64enc | quote }}
 ---
@@ -20,10 +19,9 @@ metadata:
   labels:
     common.k8s.elastic.co/type: elasticsearch
     elasticsearch.k8s.elastic.co/cluster-name: {{ template "kubezero-lib.fullname" $ }}
+    {{ include "kubezero-lib.labels" . | nindent 4 }}
   name: {{ template "kubezero-lib.fullname" $ }}-es-elastic-username
   namespace: {{ .Release.Namespace }}
-  labels:
-{{ include "kubezero-lib.labels" . | indent 4 }}
 data:
   username: {{ "elastic" | b64enc | quote }}
 {{- end }}