diff --git a/Gopkg.lock b/Gopkg.lock
index 2104d5a5dc..bd082f6d56 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -1138,7 +1138,7 @@
 
 [[projects]]
   branch = "release-0.1"
-  digest = "1:f533e4944f03eb4169dc77e4b04ee462e2b99f339b385044d914e196dc3e26ec"
+  digest = "1:d92175fcffa434a7440cee734b886f32f586dfb6413702b08b25f701662b2bbb"
   name = "sigs.k8s.io/cluster-api"
   packages = [
     "cmd/clusterctl/clientcmd",
@@ -1166,7 +1166,7 @@
     "pkg/util",
   ]
   pruneopts = "T"
-  revision = "872d75c97d0610ab695d3b758375f7ae12cd1165"
+  revision = "560b000be51c1dc371c901ab84af8070bc29e8dc"
 
 [[projects]]
   digest = "1:4e97dc637c467531240326f56e253c6d42b519424b6a89d80664ef0f3ed4f721"
diff --git a/Makefile b/Makefile
index b4775a9087..b2b7368c8b 100644
--- a/Makefile
+++ b/Makefile
@@ -219,7 +219,7 @@ create-cluster: binaries-dev ## Create a development Kubernetes cluster on AWS u
 	clusterctl create cluster -v 4 \
 	--provider aws \
 	--bootstrap-type kind \
-	-m ./cmd/clusterctl/examples/aws/out/machines.yaml \
+	-m ./cmd/clusterctl/examples/aws/out/machines-ha.yaml \
 	-c ./cmd/clusterctl/examples/aws/out/cluster.yaml \
 	-p ./cmd/clusterctl/examples/aws/out/provider-components.yaml \
 	-a ./cmd/clusterctl/examples/aws/out/addons.yaml
diff --git a/pkg/cloud/aws/services/ec2/bastion.go b/pkg/cloud/aws/services/ec2/bastion.go
index 7094df181e..b788f98bb7 100644
--- a/pkg/cloud/aws/services/ec2/bastion.go
+++ b/pkg/cloud/aws/services/ec2/bastion.go
@@ -85,7 +85,7 @@ func (s *Service) DeleteBastion() error {
 	instance, err := s.describeBastionInstance()
 	if err != nil {
 		if awserrors.IsNotFound(err) {
-			s.scope.V(2).Info("bastion instance does not exist", "instance-id", instance.ID)
+			s.scope.V(2).Info("bastion instance does not exist")
 			return nil
 		}
 		return errors.Wrap(err, "unable to describe bastion instance")
diff --git a/vendor/sigs.k8s.io/cluster-api/cmd/clusterctl/clusterdeployer/clusterclient/clusterclient.go b/vendor/sigs.k8s.io/cluster-api/cmd/clusterctl/clusterdeployer/clusterclient/clusterclient.go
index bc4fcf4a38..dad6b5f0b9 100644
--- a/vendor/sigs.k8s.io/cluster-api/cmd/clusterctl/clusterdeployer/clusterclient/clusterclient.go
+++ b/vendor/sigs.k8s.io/cluster-api/cmd/clusterctl/clusterdeployer/clusterclient/clusterclient.go
@@ -919,7 +919,7 @@ func (c *client) waitForKubectlApply(manifest string) error {
 		klog.V(2).Infof("Waiting for kubectl apply...")
 		err := c.kubectlApply(manifest)
 		if err != nil {
-			if strings.Contains(err.Error(), io.EOF.Error()) || strings.Contains(err.Error(), "refused") {
+			if strings.Contains(err.Error(), io.EOF.Error()) || strings.Contains(err.Error(), "refused") || strings.Contains(err.Error(), "no such host") {
 				// Connection was refused, probably because the API server is not ready yet.
 				klog.V(4).Infof("Waiting for kubectl apply... server not yet available: %v", err)
 				return false, nil