diff --git a/examples/terraform/aws/.terraform.lock.hcl b/examples/terraform/aws/.terraform.lock.hcl
index 83b7f98..a4c0a7c 100644
--- a/examples/terraform/aws/.terraform.lock.hcl
+++ b/examples/terraform/aws/.terraform.lock.hcl
@@ -25,24 +25,24 @@ provider "registry.terraform.io/hashicorp/aws" {
 }
 
 provider "registry.terraform.io/siderolabs/talos" {
-  version     = "0.3.2"
-  constraints = "0.3.2"
+  version     = "0.4.0-alpha.0"
+  constraints = "0.4.0-alpha.0"
   hashes = [
-    "h1:2jFWaSAqDJZAwltT/dIz6/Da8qLbuK5Q649a0BsWsLk=",
+    "h1:LygqCd18h7jYuQAR6CzajEN9lhA4gPQn7SKHcxVhSxc=",
+    "zh:0f7561370fe15a33b7ded55fe27a21f6e45b2a4950502edfcdb583fd91771239",
     "zh:0fa82a384b25a58b65523e0ea4768fa1212b1f5cfc0c9379d31162454fedcc9d",
-    "zh:12e9539ca442f1f487b2ec8f497c417b46dd1a1c56fe5c49dba309c5c2bc8c4d",
-    "zh:1a7f6f4171df7a1aca2655468921a2edfac6d0191135da17d49d159c56b85a38",
-    "zh:286d2215f916a06861cd293258d2b4e54e651c5bc0ea3ba0f7059c8d1eb6b6b0",
-    "zh:3e5a1273a53afa8b97e9249d7999c76f68209e2e219e2971e0ddd03c54f6ca6e",
-    "zh:811ec2121ed7a978323fff1b2d9159f088b76381abc49994b04aede4fdcd659c",
-    "zh:8fb91f044ce687edf777377642d34899a3a70de6d628e8a54e14781764b4cfd4",
-    "zh:93a5fbaee0300577d78fe288721e71125e0b58425f3f75b7b1de8459431e0a55",
-    "zh:95cb837443bea3d096f6d6b095b5f111862765ddda88fe92da06dfc666674039",
-    "zh:b90a40329dbd41e9100534c4718f0e2a3b5e83bf457eba172e7e51bea4555eee",
-    "zh:d19f17719e3e7569ef7da8593864727c7bdab824de3baee07b9a9ff0b02235be",
-    "zh:d25ec24d53a0de0afec2ed4caef8c50d1a236ee75ced0050283d4fcf9d5dd9ac",
-    "zh:d6300b786b7951dbe129b063f4355ed66925ec764378a7188fb9d1ec35d4bfc7",
-    "zh:e061109513ae289b7eb378c161b0e503bde216cd442a0f6d7216fdc8a886b38a",
-    "zh:e759c4d12bd4e742c3623d27b503d1bf69727fc279d68f6f44922d85c8bdd8c5",
+    "zh:1bdbf5927dd4e810f14e159fe0e5f4873b7144a58e5aee5d95e2e33b03280152",
+    "zh:230ab04c060a894e028dbf4979bc8f3b98b55e699965852541d028553d6f2d07",
+    "zh:34e7c87e4d5779141774b701bbbb6a25bf9e216d776e856bf45c6e81a46f04ad",
+    "zh:3c1415948a7a183bbe3e044396188271e0802d99f73dff5ef0ff30cc1ad1ac99",
+    "zh:505247134ad86ebcf5064e4dc7a70d3b9dfd64209cadb73483008683c5babd19",
+    "zh:8ab95ee386570be2cf2e8adcdbb0af2f1b1b47c2952dbe01ce93ba131fd8fc4d",
+    "zh:9755730e5d899329f19b54e25417eca230471ff505f9e8cb3a7d02dd6450781b",
+    "zh:9758565b452853228ecdfe8b760a07f639384160b5e48eee5f623d1b59a3c67a",
+    "zh:9d43efae13e5976607c0df656cc7023306f5881e71347483a896f8c36ed80258",
+    "zh:9e68dd968501b00de06e91cccae7dae9cf05eeafd04baae36c51949fd70b189b",
+    "zh:a6d02e21f936bc015f4c861745e1fadac9e691565c42afa552e4022eece87c09",
+    "zh:bf36b8f95a6cf81328a8a8d30b73441d551bef0da7b10fda34301e7e3dfa201b",
+    "zh:ed0383567469e1887df2e3003366b54841d8ffaa27675d132a04d970dcb1d71c",
   ]
 }
diff --git a/examples/terraform/aws/README.md b/examples/terraform/aws/README.md
index 376129b..240f957 100644
--- a/examples/terraform/aws/README.md
+++ b/examples/terraform/aws/README.md
@@ -5,14 +5,14 @@
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | ~> 1.3 |
 | <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 4.0 |
-| <a name="requirement_talos"></a> [talos](#requirement\_talos) | 0.3.2 |
+| <a name="requirement_talos"></a> [talos](#requirement\_talos) | 0.4.0-alpha.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
 | <a name="provider_aws"></a> [aws](#provider\_aws) | 4.67.0 |
-| <a name="provider_talos"></a> [talos](#provider\_talos) | 0.3.2 |
+| <a name="provider_talos"></a> [talos](#provider\_talos) | 0.4.0-alpha.0 |
 
 ## Modules
 
@@ -31,16 +31,17 @@
 |------|------|
 | [aws_iam_policy.control_plane_ccm_policy](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_policy) | resource |
 | [aws_iam_policy.worker_ccm_policy](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_policy) | resource |
-| [talos_machine_bootstrap.this](https://registry.terraform.io/providers/siderolabs/talos/0.3.2/docs/resources/machine_bootstrap) | resource |
-| [talos_machine_configuration_apply.controlplane](https://registry.terraform.io/providers/siderolabs/talos/0.3.2/docs/resources/machine_configuration_apply) | resource |
-| [talos_machine_configuration_apply.worker_group](https://registry.terraform.io/providers/siderolabs/talos/0.3.2/docs/resources/machine_configuration_apply) | resource |
-| [talos_machine_secrets.this](https://registry.terraform.io/providers/siderolabs/talos/0.3.2/docs/resources/machine_secrets) | resource |
+| [talos_machine_bootstrap.this](https://registry.terraform.io/providers/siderolabs/talos/0.4.0-alpha.0/docs/resources/machine_bootstrap) | resource |
+| [talos_machine_configuration_apply.controlplane](https://registry.terraform.io/providers/siderolabs/talos/0.4.0-alpha.0/docs/resources/machine_configuration_apply) | resource |
+| [talos_machine_configuration_apply.worker_group](https://registry.terraform.io/providers/siderolabs/talos/0.4.0-alpha.0/docs/resources/machine_configuration_apply) | resource |
+| [talos_machine_secrets.this](https://registry.terraform.io/providers/siderolabs/talos/0.4.0-alpha.0/docs/resources/machine_secrets) | resource |
 | [aws_ami.talos](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/ami) | data source |
 | [aws_availability_zones.available](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/availability_zones) | data source |
-| [talos_client_configuration.this](https://registry.terraform.io/providers/siderolabs/talos/0.3.2/docs/data-sources/client_configuration) | data source |
-| [talos_cluster_kubeconfig.this](https://registry.terraform.io/providers/siderolabs/talos/0.3.2/docs/data-sources/cluster_kubeconfig) | data source |
-| [talos_machine_configuration.controlplane](https://registry.terraform.io/providers/siderolabs/talos/0.3.2/docs/data-sources/machine_configuration) | data source |
-| [talos_machine_configuration.worker_group](https://registry.terraform.io/providers/siderolabs/talos/0.3.2/docs/data-sources/machine_configuration) | data source |
+| [talos_client_configuration.this](https://registry.terraform.io/providers/siderolabs/talos/0.4.0-alpha.0/docs/data-sources/client_configuration) | data source |
+| [talos_cluster_health.this](https://registry.terraform.io/providers/siderolabs/talos/0.4.0-alpha.0/docs/data-sources/cluster_health) | data source |
+| [talos_cluster_kubeconfig.this](https://registry.terraform.io/providers/siderolabs/talos/0.4.0-alpha.0/docs/data-sources/cluster_kubeconfig) | data source |
+| [talos_machine_configuration.controlplane](https://registry.terraform.io/providers/siderolabs/talos/0.4.0-alpha.0/docs/data-sources/machine_configuration) | data source |
+| [talos_machine_configuration.worker_group](https://registry.terraform.io/providers/siderolabs/talos/0.4.0-alpha.0/docs/data-sources/machine_configuration) | data source |
 
 ## Inputs
 
diff --git a/examples/terraform/aws/main.tf b/examples/terraform/aws/main.tf
index 6168947..e055afb 100644
--- a/examples/terraform/aws/main.tf
+++ b/examples/terraform/aws/main.tf
@@ -371,12 +371,6 @@ data "talos_client_configuration" "this" {
   cluster_name         = var.cluster_name
   client_configuration = talos_machine_secrets.this.client_configuration
   endpoints            = module.talos_control_plane_nodes.*.public_ip
-  nodes = flatten(
-    [
-      module.talos_control_plane_nodes.*.private_ip,
-      [for node in module.talos_worker_group : node.private_ip],
-    ]
-  )
 }
 
 data "talos_cluster_kubeconfig" "this" {
@@ -385,5 +379,13 @@ data "talos_cluster_kubeconfig" "this" {
   client_configuration = talos_machine_secrets.this.client_configuration
   endpoint             = module.talos_control_plane_nodes.0.public_ip
   node                 = module.talos_control_plane_nodes.0.private_ip
-  wait                 = true
+}
+
+data "talos_cluster_health" "this" {
+  depends_on = [data.talos_cluster_kubeconfig.this]
+
+  client_configuration = talos_machine_secrets.this.client_configuration
+  endpoints            = module.talos_control_plane_nodes.*.public_ip
+  control_plane_nodes  = module.talos_control_plane_nodes.*.private_ip
+  worker_nodes         = [for node in module.talos_worker_group : node.private_ip]
 }
diff --git a/examples/terraform/aws/versions.tf b/examples/terraform/aws/versions.tf
index 072db6d..274a807 100644
--- a/examples/terraform/aws/versions.tf
+++ b/examples/terraform/aws/versions.tf
@@ -7,7 +7,7 @@ terraform {
     }
     talos = {
       source  = "siderolabs/talos"
-      version = "0.3.2"
+      version = "0.4.0-alpha.0"
     }
   }
 }