diff --git a/cluster/aws/util.sh b/cluster/aws/util.sh
index 14cd1a7113b..aac03f515e9 100755
--- a/cluster/aws/util.sh
+++ b/cluster/aws/util.sh
@@ -937,15 +937,15 @@ function kube-up {
     # Create the master
     start-master
 
+    # Build ~/.kube/config
+    build-config
+
     # Start minions
     start-minions
     wait-minions
 
     # Wait for the master to be ready
     wait-master
-
-    # Build ~/.kube/config
-    build-config
   fi
 
   # Check the cluster is OK