diff --git a/resources/datalake/resource_aws_datalake.go b/resources/datalake/resource_aws_datalake.go
index 9f7867ef..a93004cf 100644
--- a/resources/datalake/resource_aws_datalake.go
+++ b/resources/datalake/resource_aws_datalake.go
@@ -88,15 +88,18 @@ func toAwsDatalakeRequest(ctx context.Context, model *awsDatalakeResourceModel)
 	}
 	req.Runtime = model.Runtime.ValueString()
 	req.Scale = datalakemodels.DatalakeScaleType(model.Scale.ValueString())
-	req.Tags = make([]*datalakemodels.DatalakeResourceTagRequest, len(model.Tags.Elements()))
-	i := 0
-	for k, v := range model.Tags.Elements() {
-		val, diag := v.(basetypes.StringValuable).ToStringValue(ctx)
-		if !diag.HasError() {
-			req.Tags[i] = &datalakemodels.DatalakeResourceTagRequest{
-				Key:   &k,
-				Value: val.ValueStringPointer(),
+	if !model.Tags.IsNull() {
+		req.Tags = make([]*datalakemodels.DatalakeResourceTagRequest, len(model.Tags.Elements()))
+		i := 0
+		for k, v := range model.Tags.Elements() {
+			val, diag := v.(basetypes.StringValuable).ToStringValue(ctx)
+			if !diag.HasError() {
+				req.Tags[i] = &datalakemodels.DatalakeResourceTagRequest{
+					Key:   &k,
+					Value: val.ValueStringPointer(),
+				}
 			}
+			i++
 		}
 	}
 	return req
@@ -367,9 +370,6 @@ func datalakeDetailsToAwsDatalakeResourceModel(ctx context.Context, resp *datala
 	if model.CertificateExpirationState.IsUnknown() {
 		model.CertificateExpirationState = types.StringNull()
 	}
-	if model.Tags.IsUnknown() {
-		model.Tags = types.MapNull(types.StringType)
-	}
 }
 
 func (r *awsDatalakeResource) Update(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) {
diff --git a/resources/datalake/resource_azure_datalake.go b/resources/datalake/resource_azure_datalake.go
index 68ce57f5..dbab4bab 100644
--- a/resources/datalake/resource_azure_datalake.go
+++ b/resources/datalake/resource_azure_datalake.go
@@ -75,15 +75,18 @@ func toAzureDatalakeRequest(ctx context.Context, model *azureDatalakeResourceMod
 	}
 	req.Runtime = model.Runtime.ValueString()
 	req.Scale = datalakemodels.DatalakeScaleType(model.Scale.ValueString())
-	req.Tags = make([]*datalakemodels.DatalakeResourceTagRequest, len(model.Tags.Elements()))
-	i := 0
-	for k, v := range model.Tags.Elements() {
-		val, diag := v.(basetypes.StringValuable).ToStringValue(ctx)
-		if !diag.HasError() {
-			req.Tags[i] = &datalakemodels.DatalakeResourceTagRequest{
-				Key:   &k,
-				Value: val.ValueStringPointer(),
+	if !model.Tags.IsNull() {
+		req.Tags = make([]*datalakemodels.DatalakeResourceTagRequest, len(model.Tags.Elements()))
+		i := 0
+		for k, v := range model.Tags.Elements() {
+			val, diag := v.(basetypes.StringValuable).ToStringValue(ctx)
+			if !diag.HasError() {
+				req.Tags[i] = &datalakemodels.DatalakeResourceTagRequest{
+					Key:   &k,
+					Value: val.ValueStringPointer(),
+				}
 			}
+			i++
 		}
 	}
 	return req
@@ -324,9 +327,6 @@ func datalakeDetailsToAzureDatalakeResourceModel(ctx context.Context, resp *data
 	if model.CertificateExpirationState.IsUnknown() {
 		model.CertificateExpirationState = types.StringNull()
 	}
-	if model.Tags.IsUnknown() {
-		model.Tags = types.MapNull(types.StringType)
-	}
 }
 
 func (r *azureDatalakeResource) Update(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) {
diff --git a/resources/datalake/schema_aws_datalake.go b/resources/datalake/schema_aws_datalake.go
index 2b49993b..6c1acb77 100644
--- a/resources/datalake/schema_aws_datalake.go
+++ b/resources/datalake/schema_aws_datalake.go
@@ -339,7 +339,6 @@ var awsDatalakeResourceSchema schema.Schema = schema.Schema{
 		},
 		"tags": schema.MapAttribute{
 			Optional:    true,
-			Computed:    true,
 			ElementType: types.StringType,
 		},
 	},
diff --git a/resources/datalake/schema_azure_datalake.go b/resources/datalake/schema_azure_datalake.go
index c9bbc998..53b6184a 100644
--- a/resources/datalake/schema_azure_datalake.go
+++ b/resources/datalake/schema_azure_datalake.go
@@ -318,7 +318,6 @@ var azureDatalakeResourceSchema schema.Schema = schema.Schema{
 		},
 		"tags": schema.MapAttribute{
 			Optional:    true,
-			Computed:    true,
 			ElementType: types.StringType,
 		},
 	},
diff --git a/resources/environments/resource_id_broker_mappings.go b/resources/environments/resource_id_broker_mappings.go
index c744d282..3ae903dc 100644
--- a/resources/environments/resource_id_broker_mappings.go
+++ b/resources/environments/resource_id_broker_mappings.go
@@ -321,6 +321,10 @@ func (r *idBrokerMappingsResource) Delete(ctx context.Context, req resource.Dele
 
 	params := operations.NewSetIDBrokerMappingsParamsWithContext(ctx)
 	input := &environmentsmodels.SetIDBrokerMappingsRequest{}
+	input.EnvironmentName = state.EnvironmentName.ValueStringPointer()
+	input.DataAccessRole = state.DataAccessRole.ValueStringPointer()
+	input.RangerAuditRole = state.RangerAuditRole.ValueString()
+	input.Mappings = make([]*environmentsmodels.IDBrokerMappingRequest, 0)
 	input.SetEmptyMappings = &emptyMappings
 	params.WithInput(input)
 	_, err := client.Operations.SetIDBrokerMappings(params)