diff --git a/modules/aks/github-connector/meshstack_integration.tf b/modules/aks/github-connector/meshstack_integration.tf
index 517f3555..7faa6d15 100644
--- a/modules/aks/github-connector/meshstack_integration.tf
+++ b/modules/aks/github-connector/meshstack_integration.tf
@@ -229,7 +229,7 @@ terraform {
   required_providers {
     meshstack = {
       source  = "meshcloud/meshstack"
-      version = "~> 0.20.0"
+      version = "~> 0.21.0"
     }
   }
 }
diff --git a/modules/aks/meshstack_integration.tf b/modules/aks/meshstack_integration.tf
index ce5258f8..b3bfaa5a 100644
--- a/modules/aks/meshstack_integration.tf
+++ b/modules/aks/meshstack_integration.tf
@@ -179,7 +179,7 @@ terraform {
   required_providers {
     meshstack = {
       source  = "meshcloud/meshstack"
-      version = "~> 0.20.0"
+      version = "~> 0.21.0"
     }
     azuread = {
       source  = "hashicorp/azuread"
diff --git a/modules/aks/starterkit/buildingblock/README.md b/modules/aks/starterkit/buildingblock/README.md
index 2ed11471..e9696c9f 100644
--- a/modules/aks/starterkit/buildingblock/README.md
+++ b/modules/aks/starterkit/buildingblock/README.md
@@ -15,7 +15,7 @@ This documentation is intended as a reference documentation for cloud foundation
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_meshstack"></a> [meshstack](#requirement\_meshstack) | ~> 0.20.0 |
+| <a name="requirement_meshstack"></a> [meshstack](#requirement\_meshstack) | ~> 0.21.0 |
 
 ## Modules
 
diff --git a/modules/aks/starterkit/buildingblock/versions.tf b/modules/aks/starterkit/buildingblock/versions.tf
index 3090fe1f..50d84db1 100644
--- a/modules/aks/starterkit/buildingblock/versions.tf
+++ b/modules/aks/starterkit/buildingblock/versions.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     meshstack = {
       source  = "meshcloud/meshstack"
-      version = "~> 0.20.0"
+      version = "~> 0.21.0"
     }
   }
 }
diff --git a/modules/aks/starterkit/meshstack_integration.tf b/modules/aks/starterkit/meshstack_integration.tf
index bef99f03..662c3a43 100644
--- a/modules/aks/starterkit/meshstack_integration.tf
+++ b/modules/aks/starterkit/meshstack_integration.tf
@@ -334,7 +334,7 @@ terraform {
   required_providers {
     meshstack = {
       source  = "meshcloud/meshstack"
-      version = "~> 0.20.0"
+      version = "~> 0.21.0"
     }
   }
 }
diff --git a/modules/aws/route53-dns-alias-record/meshstack_integration.tf b/modules/aws/route53-dns-alias-record/meshstack_integration.tf
index e0d9c772..3d346582 100644
--- a/modules/aws/route53-dns-alias-record/meshstack_integration.tf
+++ b/modules/aws/route53-dns-alias-record/meshstack_integration.tf
@@ -236,7 +236,7 @@ terraform {
     }
     meshstack = {
       source  = "meshcloud/meshstack"
-      version = "~> 0.20.0"
+      version = "~> 0.21.0"
     }
   }
 }
diff --git a/modules/aws/route53-dns-record/meshstack_integration.tf b/modules/aws/route53-dns-record/meshstack_integration.tf
index ec21f5f9..a34cca51 100644
--- a/modules/aws/route53-dns-record/meshstack_integration.tf
+++ b/modules/aws/route53-dns-record/meshstack_integration.tf
@@ -230,7 +230,7 @@ terraform {
     }
     meshstack = {
       source  = "meshcloud/meshstack"
-      version = "~> 0.20.0"
+      version = "~> 0.21.0"
     }
   }
 }
diff --git a/modules/aws/s3_bucket/meshstack_integration.tf b/modules/aws/s3_bucket/meshstack_integration.tf
index 5d7b47a8..0e7d357c 100644
--- a/modules/aws/s3_bucket/meshstack_integration.tf
+++ b/modules/aws/s3_bucket/meshstack_integration.tf
@@ -188,7 +188,7 @@ terraform {
     }
     meshstack = {
       source  = "meshcloud/meshstack"
-      version = "~> 0.20.0"
+      version = "~> 0.21.0"
     }
   }
 }
diff --git a/modules/azure/budget-alert/meshstack_integration.tf b/modules/azure/budget-alert/meshstack_integration.tf
index f01db26f..5efc6521 100644
--- a/modules/azure/budget-alert/meshstack_integration.tf
+++ b/modules/azure/budget-alert/meshstack_integration.tf
@@ -227,7 +227,7 @@ terraform {
   required_providers {
     meshstack = {
       source  = "meshcloud/meshstack"
-      version = "~> 0.20.0"
+      version = "~> 0.21.0"
     }
     azurerm = {
       source  = "hashicorp/azurerm"
diff --git a/modules/azure/meshstack_integration.tf b/modules/azure/meshstack_integration.tf
index 2d734120..18a7af4f 100644
--- a/modules/azure/meshstack_integration.tf
+++ b/modules/azure/meshstack_integration.tf
@@ -245,7 +245,7 @@ terraform {
   required_providers {
     meshstack = {
       source  = "meshcloud/meshstack"
-      version = "~> 0.20.6"
+      version = "~> 0.21.0"
     }
     azurerm = {
       source  = "hashicorp/azurerm"
diff --git a/modules/azure/resource-group/meshstack_integration.tf b/modules/azure/resource-group/meshstack_integration.tf
index 4b54244e..157bc1a9 100644
--- a/modules/azure/resource-group/meshstack_integration.tf
+++ b/modules/azure/resource-group/meshstack_integration.tf
@@ -223,7 +223,7 @@ terraform {
   required_providers {
     meshstack = {
       source  = "meshcloud/meshstack"
-      version = "~> 0.20.0"
+      version = "~> 0.21.0"
     }
     azurerm = {
       source  = "hashicorp/azurerm"
diff --git a/modules/azure/service-principal/meshstack_integration.tf b/modules/azure/service-principal/meshstack_integration.tf
index 75f5c071..0c7e6764 100644
--- a/modules/azure/service-principal/meshstack_integration.tf
+++ b/modules/azure/service-principal/meshstack_integration.tf
@@ -255,7 +255,7 @@ terraform {
   required_providers {
     meshstack = {
       source  = "meshcloud/meshstack"
-      version = "~> 0.20.0"
+      version = "~> 0.21.0"
     }
     azurerm = {
       source  = "hashicorp/azurerm"
diff --git a/modules/azure/storage-account/meshstack_integration.tf b/modules/azure/storage-account/meshstack_integration.tf
index 7fcc9734..43b50a08 100644
--- a/modules/azure/storage-account/meshstack_integration.tf
+++ b/modules/azure/storage-account/meshstack_integration.tf
@@ -214,7 +214,7 @@ terraform {
   required_providers {
     meshstack = {
       source  = "meshcloud/meshstack"
-      version = "~> 0.20.0"
+      version = "~> 0.21.0"
     }
     azurerm = {
       source  = "hashicorp/azurerm"
diff --git a/modules/gcp/storage-bucket/meshstack_integration.tf b/modules/gcp/storage-bucket/meshstack_integration.tf
index 2b3d7ffc..4be34ab4 100644
--- a/modules/gcp/storage-bucket/meshstack_integration.tf
+++ b/modules/gcp/storage-bucket/meshstack_integration.tf
@@ -206,7 +206,7 @@ terraform {
   required_providers {
     meshstack = {
       source  = "meshcloud/meshstack"
-      version = "~> 0.20.0"
+      version = "~> 0.21.0"
     }
     google = {
       source  = "hashicorp/google"
diff --git a/modules/github/repository/meshstack_integration.tf b/modules/github/repository/meshstack_integration.tf
index 71758c04..6849002b 100644
--- a/modules/github/repository/meshstack_integration.tf
+++ b/modules/github/repository/meshstack_integration.tf
@@ -252,7 +252,7 @@ terraform {
   required_providers {
     meshstack = {
       source  = "meshcloud/meshstack"
-      version = "~> 0.20.0"
+      version = "~> 0.21.0"
     }
   }
 }
diff --git a/modules/kubernetes/manifest/meshstack_integration.tf b/modules/kubernetes/manifest/meshstack_integration.tf
index fc7a05e4..27dfcb6d 100644
--- a/modules/kubernetes/manifest/meshstack_integration.tf
+++ b/modules/kubernetes/manifest/meshstack_integration.tf
@@ -202,7 +202,7 @@ terraform {
   required_providers {
     meshstack = {
       source  = "meshcloud/meshstack"
-      version = "~> 0.20.0"
+      version = "~> 0.21.0"
     }
   }
 }
diff --git a/modules/meshstack/github-workflow/meshstack_integration.tf b/modules/meshstack/github-workflow/meshstack_integration.tf
index 5b32be61..1b023df2 100644
--- a/modules/meshstack/github-workflow/meshstack_integration.tf
+++ b/modules/meshstack/github-workflow/meshstack_integration.tf
@@ -216,7 +216,7 @@ terraform {
   required_providers {
     meshstack = {
       source  = "meshcloud/meshstack"
-      version = "~> 0.20.0"
+      version = "~> 0.21.0"
     }
   }
 }
diff --git a/modules/meshstack/manual/meshstack_integration.tf b/modules/meshstack/manual/meshstack_integration.tf
index aec98794..49433477 100644
--- a/modules/meshstack/manual/meshstack_integration.tf
+++ b/modules/meshstack/manual/meshstack_integration.tf
@@ -126,7 +126,7 @@ terraform {
   required_providers {
     meshstack = {
       source  = "meshcloud/meshstack"
-      version = "~> 0.20.0"
+      version = "~> 0.21.0"
     }
   }
 }
diff --git a/modules/meshstack/noop/e2e/main.tf b/modules/meshstack/noop/e2e/main.tf
index ed7ed9c1..d108ea04 100644
--- a/modules/meshstack/noop/e2e/main.tf
+++ b/modules/meshstack/noop/e2e/main.tf
@@ -35,7 +35,7 @@ resource "meshstack_building_block_v2" "this" {
       flag              = { value_bool = true }
       num               = { value_int = 1 }
       text              = { value_string = "Hello, World!" }
-      sensitive_text    = { value_string = "Hidden value" }
+      sensitive_text    = { value_string_sensitive = "Hidden value" }
       single_select     = { value_single_select = "single1" }
       multi_select      = { value_multi_select = ["multi1", "multi2"] }
       multi_select_json = { value_multi_select = ["multi2", "multi1"] }
diff --git a/modules/meshstack/noop/meshstack_integration.tf b/modules/meshstack/noop/meshstack_integration.tf
index 37ae1f35..2ddcd92e 100644
--- a/modules/meshstack/noop/meshstack_integration.tf
+++ b/modules/meshstack/noop/meshstack_integration.tf
@@ -226,7 +226,7 @@ terraform {
   required_providers {
     meshstack = {
       source  = "meshcloud/meshstack"
-      version = "~> 0.20.0"
+      version = "~> 0.21.0"
     }
   }
 }
diff --git a/modules/oci/application-compartment/buildingblock/README.md b/modules/oci/application-compartment/buildingblock/README.md
index 4858d875..cc568a1f 100644
--- a/modules/oci/application-compartment/buildingblock/README.md
+++ b/modules/oci/application-compartment/buildingblock/README.md
@@ -161,7 +161,7 @@ The module automatically:
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_meshstack"></a> [meshstack](#requirement\_meshstack) | ~> 0.20.0 |
+| <a name="requirement_meshstack"></a> [meshstack](#requirement\_meshstack) | ~> 0.21.0 |
 | <a name="requirement_oci"></a> [oci](#requirement\_oci) | 7.32.0 |
 
 ## Modules
diff --git a/modules/oci/application-compartment/buildingblock/provider.tf b/modules/oci/application-compartment/buildingblock/provider.tf
index a524aa71..0f7480c2 100644
--- a/modules/oci/application-compartment/buildingblock/provider.tf
+++ b/modules/oci/application-compartment/buildingblock/provider.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     meshstack = {
       source  = "meshcloud/meshstack"
-      version = "~> 0.20.0"
+      version = "~> 0.21.0"
 
     }
     oci = {
diff --git a/modules/ske/forgejo-connector/meshstack_integration.tf b/modules/ske/forgejo-connector/meshstack_integration.tf
index 0e86022e..689f6439 100644
--- a/modules/ske/forgejo-connector/meshstack_integration.tf
+++ b/modules/ske/forgejo-connector/meshstack_integration.tf
@@ -266,7 +266,7 @@ terraform {
   required_providers {
     meshstack = {
       source  = "meshcloud/meshstack"
-      version = "~> 0.20.0"
+      version = "~> 0.21.0"
     }
   }
 }
diff --git a/modules/ske/ske-starterkit/buildingblock/README.md b/modules/ske/ske-starterkit/buildingblock/README.md
index fdb7b4d2..884fed4d 100644
--- a/modules/ske/ske-starterkit/buildingblock/README.md
+++ b/modules/ske/ske-starterkit/buildingblock/README.md
@@ -14,7 +14,7 @@ This building block creates a dev and prod meshStack project pair, each with a d
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_meshstack"></a> [meshstack](#requirement\_meshstack) | ~>0.20.0 |
+| <a name="requirement_meshstack"></a> [meshstack](#requirement\_meshstack) | ~> 0.21.0 |
 | <a name="requirement_random"></a> [random](#requirement\_random) | 3.8.1 |
 
 ## Modules
diff --git a/modules/ske/ske-starterkit/buildingblock/versions.tf b/modules/ske/ske-starterkit/buildingblock/versions.tf
index f6259e42..ded20edb 100644
--- a/modules/ske/ske-starterkit/buildingblock/versions.tf
+++ b/modules/ske/ske-starterkit/buildingblock/versions.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     meshstack = {
       source  = "meshcloud/meshstack"
-      version = "~>0.20.0"
+      version = "~> 0.21.0"
     }
     random = {
       source  = "hashicorp/random"
diff --git a/modules/ske/ske-starterkit/meshstack_integration.tf b/modules/ske/ske-starterkit/meshstack_integration.tf
index b9de87a0..82ada7f8 100644
--- a/modules/ske/ske-starterkit/meshstack_integration.tf
+++ b/modules/ske/ske-starterkit/meshstack_integration.tf
@@ -267,7 +267,7 @@ terraform {
   required_providers {
     meshstack = {
       source  = "meshcloud/meshstack"
-      version = "~> 0.20.0"
+      version = "~> 0.21.0"
     }
   }
 }
diff --git a/modules/stackit/git-repository/meshstack_integration.tf b/modules/stackit/git-repository/meshstack_integration.tf
index 200dff98..7000e8c9 100644
--- a/modules/stackit/git-repository/meshstack_integration.tf
+++ b/modules/stackit/git-repository/meshstack_integration.tf
@@ -278,7 +278,7 @@ terraform {
   required_providers {
     meshstack = {
       source  = "meshcloud/meshstack"
-      version = "~> 0.20.0"
+      version = "~> 0.21.0"
     }
   }
 }
diff --git a/modules/stackit/meshstack_integration.tf b/modules/stackit/meshstack_integration.tf
index eb4bcb93..85bcf64b 100644
--- a/modules/stackit/meshstack_integration.tf
+++ b/modules/stackit/meshstack_integration.tf
@@ -242,7 +242,7 @@ terraform {
   required_providers {
     meshstack = {
       source  = "meshcloud/meshstack"
-      version = "~> 0.20.0"
+      version = "~> 0.21.0"
     }
     stackit = {
       source  = "stackitcloud/stackit"
diff --git a/modules/stackit/storage-bucket/meshstack_integration.tf b/modules/stackit/storage-bucket/meshstack_integration.tf
index 5e42915a..fceb4118 100644
--- a/modules/stackit/storage-bucket/meshstack_integration.tf
+++ b/modules/stackit/storage-bucket/meshstack_integration.tf
@@ -207,7 +207,7 @@ terraform {
   required_providers {
     meshstack = {
       source  = "meshcloud/meshstack"
-      version = "~> 0.20.0"
+      version = "~> 0.21.0"
     }
   }
 }