diff --git a/master_node_install.sh b/master_node_install.sh
index c439c23..a749512 100644
--- a/master_node_install.sh
+++ b/master_node_install.sh
@@ -277,8 +277,15 @@ configure_rke2() {
   mkdir -p /etc/rancher/rke2
 
   local node_ip node_name
-  node_ip="$(hostname -I | awk '{print $1}')"
-  node_name="$(hostname -s)"
+  node_ip="$(ip -4 route get 1.1.1.1 2>/dev/null | awk '{for(i=1;i<=NF;i++) if ($i=="src") {print $(i+1); exit}}')"
+  [[ -n "${node_ip}" ]] || node_ip="$(hostnamectl --static 2>/dev/null || true)"
+  [[ -n "${node_ip}" ]] || node_ip="$(hostname -I 2>/dev/null | awk '{print $1}')"
+
+  node_name="$(hostnamectl --static 2>/dev/null || true)"
+  [[ -n "${node_name}" ]] || node_name="$(uname -n)"
+
+  [[ -n "${node_ip}" ]] || die "Failed to determine node IP"
+  [[ -n "${node_name}" ]] || die "Failed to determine node name"
 
   cat >/etc/rancher/rke2/config.yaml <<EOF
 token: ${RKE2_TOKEN}
@@ -286,11 +293,10 @@ write-kubeconfig-mode: "0644"
 node-name: ${node_name}
 tls-san:
   - ${node_ip}
-$( [[ -n "${RANCHER_HOSTNAME}" ]] && printf '  - %s\n' "${RANCHER_HOSTNAME}" )
-cni: ${CNI_PLUGIN}
 cluster-cidr: ${CLUSTER_CIDR}
 service-cidr: ${SERVICE_CIDR}
 cluster-dns: ${CLUSTER_DNS}
+cni: ${CNI_PLUGIN}
 etcd-expose-metrics: true
 kube-apiserver-arg:
   - anonymous-auth=false
@@ -298,9 +304,15 @@ kubelet-arg:
   - protect-kernel-defaults=false
 EOF
 
+  if [[ -n "${RANCHER_HOSTNAME}" ]]; then
+    echo "  - ${RANCHER_HOSTNAME}" >> /etc/rancher/rke2/config.yaml
+  fi
+
   if [[ "${DISABLE_RKE2_INGRESS}" == "true" ]]; then
-    echo 'disable:' >> /etc/rancher/rke2/config.yaml
-    echo '  - rke2-ingress-nginx' >> /etc/rancher/rke2/config.yaml
+    cat >> /etc/rancher/rke2/config.yaml <<'EOF'
+disable:
+  - rke2-ingress-nginx
+EOF
   fi
 }