diff --git a/example/main.tf b/example/main.tf
index 4c15610..c6148d4 100644
--- a/example/main.tf
+++ b/example/main.tf
@@ -3,6 +3,7 @@ provider "kind" {}
 resource "kind" "my-cluster" {
     name = "test-cluster"
     node_image = "kindest/node:v1.18.4"
+    wait_for_ready = true
     kind_config =<<KIONF
 kind: Cluster
 apiVersion: kind.x-k8s.io/v1alpha4
diff --git a/kind/provider.go b/kind/provider.go
index a1f6f2c..35edf2c 100644
--- a/kind/provider.go
+++ b/kind/provider.go
@@ -8,9 +8,9 @@ import (
 )
 
 const (
-	defaultCreateTimeout = time.Minute * 30
-	defaultUpdateTimeout = time.Minute * 30
-	defaultDeleteTimeout = time.Minute * 20
+	defaultCreateTimeout = time.Minute * 5
+	defaultUpdateTimeout = time.Minute * 5
+	defaultDeleteTimeout = time.Minute * 5
 )
 
 func Provider() terraform.ResourceProvider {
diff --git a/kind/resource_kind.go b/kind/resource_kind.go
index fad0499..35c9770 100644
--- a/kind/resource_kind.go
+++ b/kind/resource_kind.go
@@ -43,6 +43,13 @@ func resourceKind() *schema.Resource {
 				ForceNew:    true,
 				Computed:    true,
 			},
+			"wait_for_ready": &schema.Schema{
+				Type:        schema.TypeBool,
+				Description: `Defines wether or not the provider will wait for the control plane to be ready. Defaults to false`,
+				Default:     false,
+				ForceNew:    true, // TODO remove this once we have the update method defined.
+				Optional:    true,
+			},
 			"kind_config": &schema.Schema{
 				Type:        schema.TypeString,
 				Description: `The kind_config that kind will use.`,
@@ -88,6 +95,7 @@ func resourceKindCreate(d *schema.ResourceData, meta interface{}) error {
 	name := d.Get("name").(string)
 	nodeImage := d.Get("node_image").(string)
 	config := d.Get("kind_config").(string)
+	waitForReady := d.Get("wait_for_ready").(bool)
 
 	var copts []cluster.CreateOption
 	if config != "" {
@@ -102,6 +110,11 @@ func resourceKindCreate(d *schema.ResourceData, meta interface{}) error {
 		nodeImage = kindDefaults.Image
 	}
 
+	if waitForReady {
+		copts = append(copts, cluster.CreateWithWaitForReady(defaultCreateTimeout))
+		log.Printf("Will wait for cluster nodes to report ready: %t\n", waitForReady)
+	}
+
 	log.Println("=================== Creating Kind Cluster ==================")
 	provider := cluster.NewProvider(cluster.ProviderWithLogger(cmd.NewLogger()))
 	err := provider.Create(name, copts...)