diff --git a/docs/getting_started.md b/docs/getting_started.md
index d5883b5b2205..a95441adbd48 100644
--- a/docs/getting_started.md
+++ b/docs/getting_started.md
@@ -34,12 +34,12 @@ You can install Kind with the following:
 
 ```bash
 # Linux
-$ curl -Lo ./kind-linux-amd64 https://github.com/kubernetes-sigs/kind/releases/download/v0.3.0/kind-linux-amd64
+$ curl -Lo ./kind-linux-amd64 https://github.com/kubernetes-sigs/kind/releases/download/v0.4.0/kind-linux-amd64
 $ chmod +x ./kind-linux-amd64
 $ mv ./kind-linux-amd64 /usr/local/bin/kind
 
 # Darwin
-$ curl -Lo ./kind-darwin-amd64 https://github.com/kubernetes-sigs/kind/releases/download/v0.3.0/kind-darwin-amd64
+$ curl -Lo ./kind-darwin-amd64 https://github.com/kubernetes-sigs/kind/releases/download/v0.4.0/kind-darwin-amd64
 $ chmod +x ./kind-darwin-amd64
 $ mv ./kind-darwin-amd64 /usr/local/bin/kind
 ```
@@ -47,7 +47,7 @@ $ mv ./kind-darwin-amd64 /usr/local/bin/kind
 If you have a Go installed on your machine, you can install Kind with the following:
 
 ```bash
-GO111MODULE="on" go get -mod readonly sigs.k8s.io/kind@v0.3.0
+GO111MODULE="on" go get -mod readonly sigs.k8s.io/kind@v0.4.0
 ```
 
 #### clusterctl
diff --git a/scripts/e2e/create_kind_cluster.sh b/scripts/e2e/create_kind_cluster.sh
index e2720d03cb8b..48c01ead19ee 100644
--- a/scripts/e2e/create_kind_cluster.sh
+++ b/scripts/e2e/create_kind_cluster.sh
@@ -19,7 +19,7 @@ set -o nounset
 set -o pipefail
 set -o xtrace
 
-KIND_VERSION="v0.3.0"
+KIND_VERSION="v0.4.0"
 
 install_kind() {
    wget "https://github.com/kubernetes-sigs/kind/releases/download/${KIND_VERSION}/kind-linux-amd64" \
diff --git a/scripts/e2e/kind_config.template b/scripts/e2e/kind_config.template
index 7230868ee638..45ba6cc31381 100644
--- a/scripts/e2e/kind_config.template
+++ b/scripts/e2e/kind_config.template
@@ -2,10 +2,10 @@
 kind: Cluster
 apiVersion: kind.sigs.k8s.io/v1alpha3
 networking:
-  apiServerAddress: 0.0.0.0
+  apiServerAddress: ${bootstrap_vm_ip}
 kubeadmConfigPatches:
 - |
-  apiVersion: kubeadm.k8s.io/v1beta1
+  apiVersion: kubeadm.k8s.io/v1beta2
   kind: ClusterConfiguration
   metadata:
     name: config