diff --git a/kit/azure/organization-hierarchy/README.md b/kit/azure/organization-hierarchy/README.md
index 16ce22dd..0572becc 100644
--- a/kit/azure/organization-hierarchy/README.md
+++ b/kit/azure/organization-hierarchy/README.md
@@ -84,12 +84,12 @@ After deploying this module, you should probably deploy the following kit module
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| <a name="input_cloudfoundation"></a> [cloudfoundation](#input\_cloudfoundation) | Name of your cloud foundation | `string` | n/a | yes |
 | <a name="input_connectivity"></a> [connectivity](#input\_connectivity) | n/a | `string` | `"lv-connectivity"` | no |
 | <a name="input_identity"></a> [identity](#input\_identity) | n/a | `string` | `"lv-identity"` | no |
 | <a name="input_landingzones"></a> [landingzones](#input\_landingzones) | n/a | `string` | `"lv-landingzones"` | no |
 | <a name="input_locations"></a> [locations](#input\_locations) | This is for the Azure Allowed locations. Additionally, we use the first added locations where this policy assignment should exist, which is required when an identity is assigned. | `list(string)` | <pre>[<br>  "germanywestcentral"<br>]</pre> | no |
 | <a name="input_management"></a> [management](#input\_management) | n/a | `string` | `"lv-management"` | no |
+| <a name="input_management_subscription_name"></a> [management\_subscription\_name](#input\_management\_subscription\_name) | Name of your management subscription | `string` | `"management"` | no |
 | <a name="input_parentManagementGroup"></a> [parentManagementGroup](#input\_parentManagementGroup) | n/a | `string` | `"lv-foundation"` | no |
 | <a name="input_platform"></a> [platform](#input\_platform) | n/a | `string` | `"lv-platform"` | no |
 
diff --git a/kit/azure/organization-hierarchy/main.tf b/kit/azure/organization-hierarchy/main.tf
index a9318e9e..301017db 100644
--- a/kit/azure/organization-hierarchy/main.tf
+++ b/kit/azure/organization-hierarchy/main.tf
@@ -55,7 +55,7 @@ data "azurerm_subscription" "current" {
 
 resource "azurerm_subscription" "management" {
   subscription_id   = data.azurerm_subscription.current.subscription_id
-  subscription_name = "${var.cloudfoundation}-management"
+  subscription_name = var.management_subscription_name
 }
 
 resource "azurerm_management_group_subscription_association" "management" {
diff --git a/kit/azure/organization-hierarchy/template/platform-module/terragrunt.hcl b/kit/azure/organization-hierarchy/template/platform-module/terragrunt.hcl
index 31a54941..b08caf17 100644
--- a/kit/azure/organization-hierarchy/template/platform-module/terragrunt.hcl
+++ b/kit/azure/organization-hierarchy/template/platform-module/terragrunt.hcl
@@ -32,7 +32,6 @@ locals {
 
 inputs = {
   # todo: set input variables
-  cloudfoundation       = "${local.management_group_prefix}"
   connectivity          = "${local.management_group_prefix}-connectivity"
   identity              = "${local.management_group_prefix}-identity"
   landingzones          = "${local.management_group_prefix}-landingzones"
diff --git a/kit/azure/organization-hierarchy/variables.tf b/kit/azure/organization-hierarchy/variables.tf
index 3b5242fd..f128e31b 100644
--- a/kit/azure/organization-hierarchy/variables.tf
+++ b/kit/azure/organization-hierarchy/variables.tf
@@ -1,7 +1,7 @@
-variable "cloudfoundation" {
+variable "management_subscription_name" {
   type        = string
-  nullable    = false
-  description = "Name of your cloud foundation"
+  default     = "management"
+  description = "Name of your management subscription"
 }
 
 variable "parentManagementGroup" {