diff --git a/docs/resources/datalake_aws_datalake.md b/docs/resources/datalake_aws_datalake.md
index 19e4276d..dc04aa80 100644
--- a/docs/resources/datalake_aws_datalake.md
+++ b/docs/resources/datalake_aws_datalake.md
@@ -31,10 +31,24 @@ terraform {
 }
 
 resource "cdp_datalake_aws_datalake" "example" {
-  datalake_name           = "<value>"
-  environment_name        = "<value>"
-  instance_profile        = "<value>"
-  storage_bucket_location = "<value>"
+  datalake_name         = "<value>"
+  environment_name      = "<value>"
+  instance_profile      = "<value>"
+  storage_location_base = "<value>"
+  recipes = [
+    {
+      instance_group_name = "master"
+      recipe_names = [
+        "<your-recipe>",
+      ]
+    },
+    {
+      instance_group_name = "idbroker"
+      recipe_names = [
+        "<your-recipe>",
+      ]
+    }
+  ]
 }
 
 output "name" {
@@ -50,7 +64,11 @@ output "instance_profile" {
 }
 
 output "storage_bucket_location" {
-  value = cdp_datalake_aws_datalake.example.storage_bucket_location
+  value = cdp_datalake_aws_datalake.example.storage_location_base
+}
+
+output "recipes" {
+  value = cdp_datalake_aws_datalake.example.recipes
 }
 ```
 
@@ -113,6 +131,7 @@ Required:
 Optional:
 
 - `catalog` (String)
+- `os` (String)
 
 
 <a id="nestedatt--polling_options"></a>
@@ -128,12 +147,8 @@ Optional:
 
 Required:
 
-- `instance_group_name` (String)
-- `recipe_names` (Attributes Set) (see [below for nested schema](#nestedatt--recipes--recipe_names))
-
-<a id="nestedatt--recipes--recipe_names"></a>
-### Nested Schema for `recipes.recipe_names`
-
+- `instance_group_name` (String) The name of the designated instance group.
+- `recipe_names` (Set of String) The set of recipe names that are going to be applied on the given instance group.
 
 
 <a id="nestedatt--cloudera_manager"></a>
diff --git a/docs/resources/datalake_azure_datalake.md b/docs/resources/datalake_azure_datalake.md
index 7e658fa2..c61fcd0b 100644
--- a/docs/resources/datalake_azure_datalake.md
+++ b/docs/resources/datalake_azure_datalake.md
@@ -56,6 +56,7 @@ Required:
 Optional:
 
 - `catalog` (String)
+- `os` (String)
 
 
 <a id="nestedatt--polling_options"></a>
@@ -71,12 +72,8 @@ Optional:
 
 Required:
 
-- `instance_group_name` (String)
-- `recipe_names` (Attributes Set) (see [below for nested schema](#nestedatt--recipes--recipe_names))
-
-<a id="nestedatt--recipes--recipe_names"></a>
-### Nested Schema for `recipes.recipe_names`
-
+- `instance_group_name` (String) The name of the designated instance group.
+- `recipe_names` (Set of String) The set of recipe names that are going to be applied on the given instance group.
 
 
 <a id="nestedatt--cloudera_manager"></a>
diff --git a/docs/resources/datalake_gcp_datalake.md b/docs/resources/datalake_gcp_datalake.md
index 0af22cf5..fa815b71 100644
--- a/docs/resources/datalake_gcp_datalake.md
+++ b/docs/resources/datalake_gcp_datalake.md
@@ -111,6 +111,7 @@ Required:
 Optional:
 
 - `catalog` (String)
+- `os` (String)
 
 
 <a id="nestedatt--polling_options"></a>
diff --git a/docs/resources/environments_aws_environment.md b/docs/resources/environments_aws_environment.md
index 2415569e..2de2f28b 100644
--- a/docs/resources/environments_aws_environment.md
+++ b/docs/resources/environments_aws_environment.md
@@ -138,6 +138,7 @@ Optional:
 - `instance_count_by_group` (Number)
 - `instance_type` (String)
 - `multi_az` (Boolean)
+- `os` (String)
 - `recipes` (Set of String)
 
 
diff --git a/docs/resources/environments_azure_environment.md b/docs/resources/environments_azure_environment.md
index ff56a7d2..dd0d6d89 100644
--- a/docs/resources/environments_azure_environment.md
+++ b/docs/resources/environments_azure_environment.md
@@ -141,6 +141,7 @@ Optional:
 
 - `aks_private_dns_zone_id` (String)
 - `database_private_dns_zone_id` (String)
+- `flexible_server_subnet_ids` (Set of String)
 
 
 <a id="nestedatt--freeipa"></a>
@@ -152,6 +153,7 @@ Optional:
 - `image_id` (String)
 - `instance_count_by_group` (Number)
 - `instance_type` (String)
+- `os` (String)
 - `recipes` (Set of String)
 
 
diff --git a/docs/resources/environments_azure_image_terms.md b/docs/resources/environments_azure_image_terms.md
new file mode 100644
index 00000000..99cd6165
--- /dev/null
+++ b/docs/resources/environments_azure_image_terms.md
@@ -0,0 +1,26 @@
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "cdp_environments_azure_image_terms Resource - terraform-provider-cdp"
+subcategory: ""
+description: |-
+  Updates account level Azure Marketplace image policy. CDP is capable to automatically accept Azure Marketplace image terms during cluster deployment. You can use this setting in your account to opt in or opt out this behaviour.
+---
+
+# cdp_environments_azure_image_terms (Resource)
+
+Updates account level Azure Marketplace image policy. CDP is capable to automatically accept Azure Marketplace image terms during cluster deployment. You can use this setting in your account to opt in or opt out this behaviour.
+
+
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- `accepted` (Boolean) Flag to enable or disable automatic acceptance of Azure Marketplace image terms.
+
+### Read-Only
+
+- `id` (String) The ID of this resource.
+
+
diff --git a/examples/resources/cdp_datalake_aws_datalake/resource.tf b/examples/resources/cdp_datalake_aws_datalake/resource.tf
index 5a2d44ac..2cf1f21c 100644
--- a/examples/resources/cdp_datalake_aws_datalake/resource.tf
+++ b/examples/resources/cdp_datalake_aws_datalake/resource.tf
@@ -17,10 +17,24 @@ terraform {
 }
 
 resource "cdp_datalake_aws_datalake" "example" {
-  datalake_name           = "<value>"
-  environment_name        = "<value>"
-  instance_profile        = "<value>"
-  storage_bucket_location = "<value>"
+  datalake_name         = "<value>"
+  environment_name      = "<value>"
+  instance_profile      = "<value>"
+  storage_location_base = "<value>"
+  recipes = [
+    {
+      instance_group_name = "master"
+      recipe_names = [
+        "<your-recipe>",
+      ]
+    },
+    {
+      instance_group_name = "idbroker"
+      recipe_names = [
+        "<your-recipe>",
+      ]
+    }
+  ]
 }
 
 output "name" {
@@ -36,5 +50,9 @@ output "instance_profile" {
 }
 
 output "storage_bucket_location" {
-  value = cdp_datalake_aws_datalake.example.storage_bucket_location
+  value = cdp_datalake_aws_datalake.example.storage_location_base
 }
+
+output "recipes" {
+  value = cdp_datalake_aws_datalake.example.recipes
+}
\ No newline at end of file
diff --git a/resources/datalake/schema_aws_datalake.go b/resources/datalake/schema_aws_datalake.go
index 6f4fa77a..37dec849 100644
--- a/resources/datalake/schema_aws_datalake.go
+++ b/resources/datalake/schema_aws_datalake.go
@@ -308,10 +308,13 @@ var awsDatalakeResourceSchema = schema.Schema{
 			NestedObject: schema.NestedAttributeObject{
 				Attributes: map[string]schema.Attribute{
 					"instance_group_name": schema.StringAttribute{
-						Required: true,
+						MarkdownDescription: "The name of the designated instance group.",
+						Required:            true,
 					},
-					"recipe_names": schema.SetNestedAttribute{
-						Required: true,
+					"recipe_names": schema.SetAttribute{
+						MarkdownDescription: "The set of recipe names that are going to be applied on the given instance group.",
+						ElementType:         types.StringType,
+						Required:            true,
 					},
 				},
 			},
diff --git a/resources/datalake/schema_azure_datalake.go b/resources/datalake/schema_azure_datalake.go
index c9cf3dec..386a83f9 100644
--- a/resources/datalake/schema_azure_datalake.go
+++ b/resources/datalake/schema_azure_datalake.go
@@ -288,10 +288,13 @@ var azureDatalakeResourceSchema = schema.Schema{
 			NestedObject: schema.NestedAttributeObject{
 				Attributes: map[string]schema.Attribute{
 					"instance_group_name": schema.StringAttribute{
-						Required: true,
+						MarkdownDescription: "The name of the designated instance group.",
+						Required:            true,
 					},
-					"recipe_names": schema.SetNestedAttribute{
-						Required: true,
+					"recipe_names": schema.SetAttribute{
+						MarkdownDescription: "The set of recipe names that are going to be applied on the given instance group.",
+						ElementType:         types.StringType,
+						Required:            true,
 					},
 				},
 			},