diff --git a/addons/ekco/template/base/reboot/startup.sh b/addons/ekco/template/base/reboot/startup.sh
index 9ba813a4d0..12a96990f0 100755
--- a/addons/ekco/template/base/reboot/startup.sh
+++ b/addons/ekco/template/base/reboot/startup.sh
@@ -8,9 +8,9 @@ fi
 export KUBECONFIG=/etc/kubernetes/kubelet.conf
 
 # wait for Kubernetes API
-master=$(cat /etc/kubernetes/kubelet.conf | grep ' server:' | awk '{ print $2 }')
+master=$(grep ' server: ' /etc/kubernetes/kubelet.conf | awk '{ print $2 }' | sed 's/"//g')
 while [ "$(curl --noproxy "*" -sk $master/healthz)" != "ok" ]; do
         sleep 1
 done
 
-kubectl uncordon $(hostname | tr '[:upper:]' '[:lower:]')
+kubectl uncordon "$(hostname | tr '[:upper:]' '[:lower:]')"
diff --git a/scripts/common/kubernetes.sh b/scripts/common/kubernetes.sh
index a9f0c2fcb4..5c2372c903 100644
--- a/scripts/common/kubernetes.sh
+++ b/scripts/common/kubernetes.sh
@@ -259,9 +259,9 @@ function kubernetes_has_remotes() {
     return 1
 }
 
-# Fetch the load balancer endpoint from the cluster.
+# Fetch the load balancer endpoint from the kubelet.conf.
 function existing_kubernetes_api_address() {
-    kubectl get cm -n kube-system kurl-config -o jsonpath='{ .data.kubernetes_api_address }'
+    grep ' server: ' /etc/kubernetes/kubelet.conf | awk '{ print $2 }' | sed 's/"//g'
 }
 
 # During the upgrade user might change the load balancer endpoint or want to use EKCO internal load balancer. So, we
@@ -281,7 +281,7 @@ function kubernetes_api_address() {
 
         addr=$(${DIR}/bin/kurl format-address ${addr})
 
-        echo "${addr}:${port}"
+        echo "https://${addr}:${port}"
     fi
 }
 
diff --git a/scripts/distro/kubeadm/distro.sh b/scripts/distro/kubeadm/distro.sh
index 9ca72d4ec2..06d5f1860a 100644
--- a/scripts/distro/kubeadm/distro.sh
+++ b/scripts/distro/kubeadm/distro.sh
@@ -194,6 +194,6 @@ EOF
 }
 
 function kubeadm_api_is_healthy() {
-    curl --globoff --noproxy "*" --fail --silent --insecure "https://$(kubernetes_api_address)/healthz" >/dev/null
+    curl --globoff --noproxy "*" --fail --silent --insecure "$(kubernetes_api_address)/healthz" >/dev/null
 }