diff --git a/xCAT-server/sbin/configmic b/xCAT-server/sbin/configmic
index b6fcdddb2..306099dab 100755
--- a/xCAT-server/sbin/configmic
+++ b/xCAT-server/sbin/configmic
@@ -71,6 +71,9 @@ my ($rc, $output) = runsyscmd ($cmd);
 if ($rc) {
     $cmd = "wget -N --waitretry=10 --random-wait -T 60 http://$master/$cfgpath/miccfg.$nodename -P $tmppath";
     runsyscmd ($cmd, "Error: failed to download mic configuration file from $master\n", 3);
+} else {
+    # Using $nodename_short was correct, so use that from now on
+    $nodename = $nodename_short;
 }
 
 unless (-r "$tmppath/miccfg.$nodename") {