diff --git a/docs/data-sources/tenants.md b/docs/data-sources/tenants.md
index 7b6486318..438682077 100644
--- a/docs/data-sources/tenants.md
+++ b/docs/data-sources/tenants.md
@@ -31,9 +31,9 @@ Provides information about existing tenants.
 ### Read-Only
 
 - `id` (String) The unique ID for this resource.
-- `tenants` (Block List) A list of tenants that match the filter(s). (see [below for nested schema](#nestedblock--tenants))
+- `tenants` (Attributes List) (see [below for nested schema](#nestedatt--tenants))
 
-<a id="nestedblock--tenants"></a>
+<a id="nestedatt--tenants"></a>
 ### Nested Schema for `tenants`
 
 Read-Only:
diff --git a/octopusdeploy_framework/datasource_tenants.go b/octopusdeploy_framework/datasource_tenants.go
index fc0654a3e..e9559ff49 100644
--- a/octopusdeploy_framework/datasource_tenants.go
+++ b/octopusdeploy_framework/datasource_tenants.go
@@ -31,14 +31,6 @@ func (*tenantsDataSource) Schema(_ context.Context, req datasource.SchemaRequest
 	resp.Schema = datasourceSchema.Schema{
 		Description: "Provides information about existing tenants.",
 		Attributes:  schemas.GetTenantsDataSourceSchema(),
-		Blocks: map[string]datasourceSchema.Block{
-			"tenants": datasourceSchema.ListNestedBlock{
-				Description: "A list of tenants that match the filter(s).",
-				NestedObject: datasourceSchema.NestedBlockObject{
-					Attributes: schemas.GetTenantDataSourceSchema(),
-				},
-			},
-		},
 	}
 }
 
diff --git a/octopusdeploy_framework/schemas/tenant.go b/octopusdeploy_framework/schemas/tenant.go
index 497540621..a63b1f3a1 100644
--- a/octopusdeploy_framework/schemas/tenant.go
+++ b/octopusdeploy_framework/schemas/tenant.go
@@ -90,6 +90,13 @@ func GetTenantsDataSourceSchema() map[string]datasourceSchema.Attribute {
 		"tags":     util.GetQueryDatasourceTags(),
 		"space_id": GetSpaceIdDatasourceSchema("tenants", false),
 		"take":     util.GetQueryTakeDatasourceSchema(),
+		"tenants": datasourceSchema.ListNestedAttribute{
+			Computed: true,
+			Optional: false,
+			NestedObject: datasourceSchema.NestedAttributeObject{
+				Attributes: GetTenantDataSourceSchema(),
+			},
+		},
 	}
 }