diff --git a/docs/data-sources/space.md b/docs/data-sources/space.md
index 8857324cf..fead08e98 100644
--- a/docs/data-sources/space.md
+++ b/docs/data-sources/space.md
@@ -15,13 +15,16 @@ Provides information about an existing space.
 <!-- schema generated by tfplugindocs -->
 ## Schema
 
+### Optional
+
+- `name` (String) The name of this resource, no more than 20 characters long
+
 ### Read-Only
 
 - `description` (String) The description of this space.
 - `id` (String) The unique ID for this resource.
 - `is_default` (Boolean) Specifies if this space is the default space in Octopus.
 - `is_task_queue_stopped` (Boolean) Specifies the status of the task queue for this space.
-- `name` (String) The name of this resource, no more than 20 characters long
 - `slug` (String) The unique slug of this space
 - `space_managers_team_members` (Set of String) A list of user IDs designated to be managers of this space.
 - `space_managers_teams` (Set of String) A list of team IDs designated to be managers of this space.
diff --git a/docs/data-sources/spaces.md b/docs/data-sources/spaces.md
index 8313e89c9..09920355e 100644
--- a/docs/data-sources/spaces.md
+++ b/docs/data-sources/spaces.md
@@ -39,13 +39,16 @@ data "octopusdeploy_spaces" "spaces" {
 <a id="nestedatt--spaces"></a>
 ### Nested Schema for `spaces`
 
+Optional:
+
+- `name` (String) The name of this resource, no more than 20 characters long
+
 Read-Only:
 
 - `description` (String) The description of this space.
 - `id` (String) The unique ID for this resource.
 - `is_default` (Boolean) Specifies if this space is the default space in Octopus.
 - `is_task_queue_stopped` (Boolean) Specifies the status of the task queue for this space.
-- `name` (String) The name of this resource, no more than 20 characters long
 - `slug` (String) The unique slug of this space
 - `space_managers_team_members` (Set of String) A list of user IDs designated to be managers of this space.
 - `space_managers_teams` (Set of String) A list of team IDs designated to be managers of this space.
diff --git a/docs/resources/artifactory_generic_feed.md b/docs/resources/artifactory_generic_feed.md
index 2ae2cbf7e..ee2b35cd4 100644
--- a/docs/resources/artifactory_generic_feed.md
+++ b/docs/resources/artifactory_generic_feed.md
@@ -34,13 +34,16 @@ resource "octopusdeploy_artifactory_generic_feed" "example" {
 
 ### Optional
 
-- `id` (String) The unique ID for this resource.
 - `layout_regex` (String)
 - `package_acquisition_location_options` (List of String)
 - `password` (String, Sensitive) The password associated with this resource.
 - `space_id` (String) The space ID associated with this artifactory generic feed.
 - `username` (String, Sensitive) The username associated with this resource.
 
+### Read-Only
+
+- `id` (String) The unique ID for this resource.
+
 ## Import
 
 Import is supported using the following syntax:
diff --git a/docs/resources/aws_elastic_container_registry.md b/docs/resources/aws_elastic_container_registry.md
index e0b4f802f..82050ba54 100644
--- a/docs/resources/aws_elastic_container_registry.md
+++ b/docs/resources/aws_elastic_container_registry.md
@@ -31,10 +31,13 @@ resource "octopusdeploy_aws_elastic_container_registry" "example" {
 
 ### Optional
 
-- `id` (String) The unique ID for this resource.
 - `package_acquisition_location_options` (List of String)
 - `space_id` (String) The space ID associated with this aws elastic container registry.
 
+### Read-Only
+
+- `id` (String) The unique ID for this resource.
+
 ## Import
 
 Import is supported using the following syntax:
diff --git a/docs/resources/docker_container_registry.md b/docs/resources/docker_container_registry.md
index 8a59fe071..b07f9f70f 100644
--- a/docs/resources/docker_container_registry.md
+++ b/docs/resources/docker_container_registry.md
@@ -31,13 +31,16 @@ resource "octopusdeploy_docker_container_registry" "example" {
 ### Optional
 
 - `api_version` (String)
-- `id` (String) The unique ID for this resource.
 - `package_acquisition_location_options` (List of String)
 - `password` (String, Sensitive) The password associated with this resource.
 - `registry_path` (String)
 - `space_id` (String) The space ID associated with this docker container registry feed.
 - `username` (String, Sensitive) The username associated with this resource.
 
+### Read-Only
+
+- `id` (String) The unique ID for this resource.
+
 ## Import
 
 Import is supported using the following syntax:
diff --git a/docs/resources/environment.md b/docs/resources/environment.md
index ec90437fe..2bcc66159 100644
--- a/docs/resources/environment.md
+++ b/docs/resources/environment.md
@@ -44,7 +44,6 @@ resource "octopusdeploy_environment" "example" {
 
 - `allow_dynamic_infrastructure` (Boolean)
 - `description` (String) The description of this environment.
-- `id` (String) The unique ID for this resource.
 - `jira_extension_settings` (Block List) Provides extension settings for the Jira integration for this environment. (see [below for nested schema](#nestedblock--jira_extension_settings))
 - `jira_service_management_extension_settings` (Block List) Provides extension settings for the Jira Service Management (JSM) integration for this environment. (see [below for nested schema](#nestedblock--jira_service_management_extension_settings))
 - `servicenow_extension_settings` (Block List) Provides extension settings for the ServiceNow integration for this environment. (see [below for nested schema](#nestedblock--servicenow_extension_settings))
@@ -53,6 +52,10 @@ resource "octopusdeploy_environment" "example" {
 - `space_id` (String) The space ID associated with this environment.
 - `use_guided_failure` (Boolean)
 
+### Read-Only
+
+- `id` (String) The unique ID for this resource.
+
 <a id="nestedblock--jira_extension_settings"></a>
 ### Nested Schema for `jira_extension_settings`
 
diff --git a/docs/resources/git_credential.md b/docs/resources/git_credential.md
index ad9aa4392..c47cc3c4a 100644
--- a/docs/resources/git_credential.md
+++ b/docs/resources/git_credential.md
@@ -24,8 +24,11 @@ Manages a Git credential in Octopus Deploy.
 ### Optional
 
 - `description` (String) The description of this Git Credential.
-- `id` (String) The unique ID for this resource.
 - `space_id` (String) The space ID associated with this Git Credential.
 - `type` (String) The Git credential authentication type.
 
+### Read-Only
+
+- `id` (String) The unique ID for this resource.
+
 
diff --git a/docs/resources/github_repository_feed.md b/docs/resources/github_repository_feed.md
index 37e9601c1..c739d1874 100644
--- a/docs/resources/github_repository_feed.md
+++ b/docs/resources/github_repository_feed.md
@@ -33,12 +33,15 @@ resource "octopusdeploy_github_repository_feed" "example" {
 
 - `download_attempts` (Number) The number of times a deployment should attempt to download a package from this feed before failing.
 - `download_retry_backoff_seconds` (Number) The number of seconds to apply as a linear back off between download attempts.
-- `id` (String) The unique ID for this resource.
 - `package_acquisition_location_options` (List of String)
 - `password` (String, Sensitive) The password associated with this resource.
 - `space_id` (String) The space ID associated with this github repository feed.
 - `username` (String, Sensitive) The username associated with this resource.
 
+### Read-Only
+
+- `id` (String) The unique ID for this resource.
+
 ## Import
 
 Import is supported using the following syntax:
diff --git a/docs/resources/helm_feed.md b/docs/resources/helm_feed.md
index 5eed44882..56fd3529a 100644
--- a/docs/resources/helm_feed.md
+++ b/docs/resources/helm_feed.md
@@ -29,12 +29,15 @@ resource "octopusdeploy_helm_feed" "example" {
 
 ### Optional
 
-- `id` (String) The unique ID for this resource.
 - `package_acquisition_location_options` (List of String)
 - `password` (String, Sensitive) The password associated with this resource.
 - `space_id` (String) The space ID associated with this helm feed.
 - `username` (String, Sensitive) The username associated with this resource.
 
+### Read-Only
+
+- `id` (String) The unique ID for this resource.
+
 ## Import
 
 Import is supported using the following syntax:
diff --git a/docs/resources/library_variable_set.md b/docs/resources/library_variable_set.md
index 1eac0caca..46bdfca29 100644
--- a/docs/resources/library_variable_set.md
+++ b/docs/resources/library_variable_set.md
@@ -22,12 +22,12 @@ This resource manages library variable sets in Octopus Deploy.
 ### Optional
 
 - `description` (String) The description of this library variable set.
-- `id` (String) The unique ID for this resource.
 - `space_id` (String) The space ID associated with this library variable set.
 - `template` (Block List) (see [below for nested schema](#nestedblock--template))
 
 ### Read-Only
 
+- `id` (String) The unique ID for this resource.
 - `template_ids` (Map of String)
 - `variable_set_id` (String)
 
@@ -43,7 +43,10 @@ Optional:
 - `default_value` (String) A default value for the parameter, if applicable. This can be a hard-coded value or a variable reference.
 - `display_settings` (Map of String) The display settings for the parameter.
 - `help_text` (String) The help presented alongside the parameter input.
-- `id` (String) The unique ID for this resource.
 - `label` (String) The label shown beside the parameter when presented in the deployment process. Example: `Server name`.
 
+Read-Only:
+
+- `id` (String) The unique ID for this resource.
+
 
diff --git a/docs/resources/lifecycle.md b/docs/resources/lifecycle.md
index c1273c351..a311d4785 100644
--- a/docs/resources/lifecycle.md
+++ b/docs/resources/lifecycle.md
@@ -63,12 +63,15 @@ resource "octopusdeploy_lifecycle" "example" {
 ### Optional
 
 - `description` (String) The description of this lifecycle.
-- `id` (String) The unique ID for this resource.
 - `phase` (Block List) Defines a phase in the lifecycle. (see [below for nested schema](#nestedblock--phase))
 - `release_retention_policy` (Block List) Defines the retention policy for releases or tentacles. (see [below for nested schema](#nestedblock--release_retention_policy))
 - `space_id` (String) The space ID associated with this resource.
 - `tentacle_retention_policy` (Block List) Defines the retention policy for releases or tentacles. (see [below for nested schema](#nestedblock--tentacle_retention_policy))
 
+### Read-Only
+
+- `id` (String) The unique ID for this resource.
+
 <a id="nestedblock--phase"></a>
 ### Nested Schema for `phase`
 
diff --git a/docs/resources/maven_feed.md b/docs/resources/maven_feed.md
index 1c01d16e8..5893ccc6a 100644
--- a/docs/resources/maven_feed.md
+++ b/docs/resources/maven_feed.md
@@ -33,12 +33,15 @@ resource "octopusdeploy_maven_feed" "example" {
 
 - `download_attempts` (Number) The number of times a deployment should attempt to download a package from this feed before failing.
 - `download_retry_backoff_seconds` (Number) The number of seconds to apply as a linear back off between download attempts.
-- `id` (String) The unique ID for this resource.
 - `package_acquisition_location_options` (List of String)
 - `password` (String, Sensitive) The password associated with this resource.
 - `space_id` (String) The space ID associated with this maven feed.
 - `username` (String, Sensitive) The username associated with this resource.
 
+### Read-Only
+
+- `id` (String) The unique ID for this resource.
+
 ## Import
 
 Import is supported using the following syntax:
diff --git a/docs/resources/nuget_feed.md b/docs/resources/nuget_feed.md
index 4a736c70a..282dff5d6 100644
--- a/docs/resources/nuget_feed.md
+++ b/docs/resources/nuget_feed.md
@@ -34,13 +34,16 @@ resource "octopusdeploy_nuget_feed" "example" {
 
 - `download_attempts` (Number) The number of times a deployment should attempt to download a package from this feed before failing.
 - `download_retry_backoff_seconds` (Number) The number of seconds to apply as a linear back off between download attempts.
-- `id` (String) The unique ID for this resource.
 - `is_enhanced_mode` (Boolean) This will improve performance of the NuGet feed but may not be supported by some older feeds. Disable if the operation, Create Release does not return the latest version for a package.
 - `package_acquisition_location_options` (List of String)
 - `password` (String, Sensitive) The password associated with this resource.
 - `space_id` (String) The space ID associated with this nuget feed.
 - `username` (String, Sensitive) The username associated with this resource.
 
+### Read-Only
+
+- `id` (String) The unique ID for this resource.
+
 ## Import
 
 Import is supported using the following syntax:
diff --git a/docs/resources/project.md b/docs/resources/project.md
index 6763fc2fd..218c4259f 100644
--- a/docs/resources/project.md
+++ b/docs/resources/project.md
@@ -85,7 +85,6 @@ resource "octopusdeploy_project" "example" {
 - `git_anonymous_persistence_settings` (Block List) Provides Git-related persistence settings for a version-controlled project. (see [below for nested schema](#nestedblock--git_anonymous_persistence_settings))
 - `git_library_persistence_settings` (Block List) Provides Git-related persistence settings for a version-controlled project. (see [below for nested schema](#nestedblock--git_library_persistence_settings))
 - `git_username_password_persistence_settings` (Block List) Provides Git-related persistence settings for a version-controlled project. (see [below for nested schema](#nestedblock--git_username_password_persistence_settings))
-- `id` (String) The unique ID for this resource.
 - `included_library_variable_sets` (List of String) The list of included library variable set IDs.
 - `is_disabled` (Boolean)
 - `is_discrete_channel_release` (Boolean) Treats releases of different channels to the same environment as a separate deployment dimension
@@ -103,6 +102,7 @@ resource "octopusdeploy_project" "example" {
 ### Read-Only
 
 - `deployment_process_id` (String)
+- `id` (String) The unique ID for this resource.
 - `variable_set_id` (String)
 
 <a id="nestedblock--auto_deploy_release_overrides"></a>
diff --git a/docs/resources/project_group.md b/docs/resources/project_group.md
index d06af7575..1e79bf897 100644
--- a/docs/resources/project_group.md
+++ b/docs/resources/project_group.md
@@ -29,9 +29,12 @@ resource "octopusdeploy_project_group" "example" {
 ### Optional
 
 - `description` (String) The description of this project group.
-- `id` (String) The unique ID for this resource.
 - `space_id` (String) The space ID associated with this project group.
 
+### Read-Only
+
+- `id` (String) The unique ID for this resource.
+
 ## Import
 
 Import is supported using the following syntax:
diff --git a/docs/resources/runbook.md b/docs/resources/runbook.md
index 09b12e7b3..60d7cdcc5 100644
--- a/docs/resources/runbook.md
+++ b/docs/resources/runbook.md
@@ -28,13 +28,13 @@ This resource manages runbooks in Octopus Deploy.
 - `environment_scope` (String) Determines how the runbook is scoped to environments.
 - `environments` (List of String) When environment_scope is set to "Specified", this is the list of environments the runbook can be run against.
 - `force_package_download` (Boolean) Whether to force packages to be re-downloaded or not.
-- `id` (String) The unique ID for this resource.
 - `multi_tenancy_mode` (String) The tenanted deployment mode of the runbook. Valid modes are `Untenanted`, `TenantedOrUntenanted`, `Tenanted`
 - `retention_policy` (Block List) Sets the runbook retention policy. (see [below for nested schema](#nestedblock--retention_policy))
 - `space_id` (String) The space ID associated with this runbook.
 
 ### Read-Only
 
+- `id` (String) The unique ID for this resource.
 - `published_runbook_snapshot_id` (String) The published snapshot ID.
 - `runbook_process_id` (String) The runbook process ID.
 
diff --git a/docs/resources/script_module.md b/docs/resources/script_module.md
index bb484cf04..386dd8bf0 100644
--- a/docs/resources/script_module.md
+++ b/docs/resources/script_module.md
@@ -34,11 +34,14 @@ resource "octopusdeploy_script_module" "example" {
 ### Optional
 
 - `description` (String) The description of this script module.
-- `id` (String) The unique ID for this resource.
 - `script` (Block List) The script associated with this script module. (see [below for nested schema](#nestedblock--script))
 - `space_id` (String) The space ID associated with this Script Module.
 - `variable_set_id` (String) The variable set ID for this script module.
 
+### Read-Only
+
+- `id` (String) The unique ID for this resource.
+
 <a id="nestedblock--script"></a>
 ### Nested Schema for `script`
 
diff --git a/docs/resources/space.md b/docs/resources/space.md
index f2b0f3084..25ab2ac87 100644
--- a/docs/resources/space.md
+++ b/docs/resources/space.md
@@ -33,13 +33,16 @@ resource "octopusdeploy_space" "example" {
 ### Optional
 
 - `description` (String) The description of this space.
-- `id` (String) The unique ID for this resource.
 - `is_default` (Boolean) Specifies if this space is the default space in Octopus.
 - `is_task_queue_stopped` (Boolean) Specifies the status of the task queue for this space.
 - `slug` (String) The unique slug of this space
 - `space_managers_team_members` (Set of String) A list of user IDs designated to be managers of this space.
 - `space_managers_teams` (Set of String) A list of team IDs designated to be managers of this space.
 
+### Read-Only
+
+- `id` (String) The unique ID for this resource.
+
 ## Import
 
 Import is supported using the following syntax:
diff --git a/docs/resources/tag_set.md b/docs/resources/tag_set.md
index 086ea7ae6..fb0eef8a4 100644
--- a/docs/resources/tag_set.md
+++ b/docs/resources/tag_set.md
@@ -43,10 +43,13 @@ resource "octopusdeploy_tag" "beta" {
 ### Optional
 
 - `description` (String) The description of this tag set.
-- `id` (String) The unique ID for this resource.
 - `sort_order` (Number) The sort order associated with this resource.
 - `space_id` (String) The space ID associated with this resource.
 
+### Read-Only
+
+- `id` (String) The unique ID for this resource.
+
 ## Import
 
 Import is supported using the following syntax:
diff --git a/docs/resources/tenant.md b/docs/resources/tenant.md
index 16851becb..0a62ebe36 100644
--- a/docs/resources/tenant.md
+++ b/docs/resources/tenant.md
@@ -20,8 +20,11 @@ This resource manages tenants in Octopus Deploy.
 
 - `cloned_from_tenant_id` (String) The ID of the tenant from which this tenant was cloned.
 - `description` (String) The description of this tenant.
-- `id` (String) The unique ID for this resource.
 - `space_id` (String) The space ID associated with this tenant.
 - `tenant_tags` (List of String) A list of tenant tags associated with this resource.
 
+### Read-Only
+
+- `id` (String) The unique ID for this resource.
+
 ~> **NOTE property `project_environment` deprecated:** The `project_environment` property has been replaced by the `octopusdeploy_tenant_project` resource to allow more advanced provisioning scenarioes. 
\ No newline at end of file
diff --git a/docs/resources/tenant_common_variable.md b/docs/resources/tenant_common_variable.md
index c306e3c59..778122ff9 100644
--- a/docs/resources/tenant_common_variable.md
+++ b/docs/resources/tenant_common_variable.md
@@ -23,8 +23,11 @@ Manages a tenant common variable in Octopus Deploy.
 
 ### Optional
 
-- `id` (String) The unique ID for this resource.
 - `space_id` (String) The space ID associated with this Tenant Common Variable.
 - `value` (String, Sensitive) The value of the variable.
 
+### Read-Only
+
+- `id` (String) The unique ID for this resource.
+
 
diff --git a/docs/resources/tenant_project.md b/docs/resources/tenant_project.md
index 2558f847b..089ddc20c 100644
--- a/docs/resources/tenant_project.md
+++ b/docs/resources/tenant_project.md
@@ -23,7 +23,10 @@ description: |-
 ### Optional
 
 - `environment_ids` (List of String) The environment IDs associated with this tenant.
-- `id` (String) The unique ID for this resource.
 - `space_id` (String) The space ID associated with this project tenant.
 
+### Read-Only
+
+- `id` (String) The unique ID for this resource.
+
 
diff --git a/docs/resources/username_password_account.md b/docs/resources/username_password_account.md
index f00bd5ad6..b12926a38 100644
--- a/docs/resources/username_password_account.md
+++ b/docs/resources/username_password_account.md
@@ -30,13 +30,16 @@ resource "octopusdeploy_username_password_account" "example" {
 
 - `description` (String) The description of this username/password account.
 - `environments` (List of String) A list of environment IDs associated with this resource.
-- `id` (String) The unique ID for this resource.
 - `password` (String, Sensitive) The password associated with this resource.
 - `space_id` (String) The space ID associated with this resource.
 - `tenant_tags` (List of String) A list of tenant tags associated with this resource.
 - `tenanted_deployment_participation` (String) The tenanted deployment mode of the resource. Valid account types are `Untenanted`, `TenantedOrUntenanted`, or `Tenanted`.
 - `tenants` (List of String) A list of tenant IDs associated with this resource.
 
+### Read-Only
+
+- `id` (String) The unique ID for this resource.
+
 ## Import
 
 Import is supported using the following syntax:
diff --git a/docs/resources/variable.md b/docs/resources/variable.md
index a8fb28231..0ff293df1 100644
--- a/docs/resources/variable.md
+++ b/docs/resources/variable.md
@@ -115,7 +115,7 @@ resource "octopusdeploy_variable" "prompted_variable" {
 ### Read-Only
 
 - `encrypted_value` (String)
-- `id` (String) The ID of this resource.
+- `id` (String) The unique ID for this resource.
 - `key_fingerprint` (String)
 
 <a id="nestedblock--prompt"></a>
diff --git a/octopusdeploy_framework/schemas/git_credential.go b/octopusdeploy_framework/schemas/git_credential.go
index 43d57ea30..606445e2c 100644
--- a/octopusdeploy_framework/schemas/git_credential.go
+++ b/octopusdeploy_framework/schemas/git_credential.go
@@ -21,7 +21,7 @@ func (g GitCredentialSchema) GetResourceSchema() resourceSchema.Schema {
 	return resourceSchema.Schema{
 		Description: "Manages a Git credential in Octopus Deploy.",
 		Attributes: map[string]resourceSchema.Attribute{
-			"id":          util.ResourceString().Optional().Computed().PlanModifiers(stringplanmodifier.UseStateForUnknown()).Description("The unique ID for this resource.").Build(),
+			"id":          GetIdResourceSchema(),
 			"space_id":    util.ResourceString().Optional().Computed().PlanModifiers(stringplanmodifier.UseStateForUnknown()).Description("The space ID associated with this Git Credential.").Build(),
 			"name":        util.ResourceString().Required().Description("The name of this Git Credential.").Build(),
 			"description": util.ResourceString().Optional().Computed().Default("").Description("The description of this Git Credential.").Build(),
diff --git a/octopusdeploy_framework/schemas/lifecycle.go b/octopusdeploy_framework/schemas/lifecycle.go
index bdf4662e3..2f4201d99 100644
--- a/octopusdeploy_framework/schemas/lifecycle.go
+++ b/octopusdeploy_framework/schemas/lifecycle.go
@@ -24,7 +24,7 @@ func (l LifecycleSchema) GetResourceSchema() resourceSchema.Schema {
 	return resourceSchema.Schema{
 		Description: "This resource manages lifecycles in Octopus Deploy.",
 		Attributes: map[string]resourceSchema.Attribute{
-			"id":          util.ResourceString().Optional().Computed().Description("The unique ID for this resource.").PlanModifiers(stringplanmodifier.UseStateForUnknown()).Build(),
+			"id":          GetIdResourceSchema(),
 			"space_id":    util.ResourceString().Optional().Computed().Description("The space ID associated with this resource.").PlanModifiers(stringplanmodifier.UseStateForUnknown()).Build(),
 			"name":        util.ResourceString().Required().Description("The name of this resource.").Build(),
 			"description": util.ResourceString().Optional().Computed().Default("").Description("The description of this lifecycle.").Build(),
diff --git a/octopusdeploy_framework/schemas/schema.go b/octopusdeploy_framework/schemas/schema.go
index 70652b5d6..3160e01ab 100644
--- a/octopusdeploy_framework/schemas/schema.go
+++ b/octopusdeploy_framework/schemas/schema.go
@@ -130,7 +130,6 @@ func GetIdResourceSchema() resourceSchema.Attribute {
 	return resourceSchema.StringAttribute{
 		Description: "The unique ID for this resource.",
 		Computed:    true,
-		Optional:    true,
 		PlanModifiers: []planmodifier.String{
 			stringplanmodifier.UseStateForUnknown(),
 		},
diff --git a/octopusdeploy_framework/schemas/space.go b/octopusdeploy_framework/schemas/space.go
index 18962bd90..0b9d3efdc 100644
--- a/octopusdeploy_framework/schemas/space.go
+++ b/octopusdeploy_framework/schemas/space.go
@@ -77,6 +77,7 @@ func (s SpaceSchema) GetDatasourceSchema() datasourceSchema.Schema {
 					stringvalidator.LengthBetween(1, 20),
 				},
 				Computed: true,
+				Optional: true,
 			},
 			"slug": GetSlugDatasourceSchema(spaceDescription, true),
 			"space_managers_teams": datasourceSchema.SetAttribute{
diff --git a/octopusdeploy_framework/schemas/tag_set.go b/octopusdeploy_framework/schemas/tag_set.go
index 322eff22d..c0382bb4d 100644
--- a/octopusdeploy_framework/schemas/tag_set.go
+++ b/octopusdeploy_framework/schemas/tag_set.go
@@ -20,12 +20,7 @@ func (t TagSetSchema) GetResourceSchema() resourceSchema.Schema {
 	return resourceSchema.Schema{
 		Description: "This resource manages tag sets in Octopus Deploy.",
 		Attributes: map[string]resourceSchema.Attribute{
-			"id": util.ResourceString().
-				Optional().
-				Computed().
-				Description("The unique ID for this resource.").
-				PlanModifiers(stringplanmodifier.UseStateForUnknown()).
-				Build(),
+			"id": GetIdResourceSchema(),
 			"name": util.ResourceString().
 				Required().
 				Description("The name of this resource.").
diff --git a/octopusdeploy_framework/schemas/tenant_project_variable.go b/octopusdeploy_framework/schemas/tenant_project_variable.go
index 5ee72ce86..1a392d89b 100644
--- a/octopusdeploy_framework/schemas/tenant_project_variable.go
+++ b/octopusdeploy_framework/schemas/tenant_project_variable.go
@@ -56,11 +56,7 @@ func (t TenantProjectVariableSchema) GetResourceSchema() schema.Schema {
 	return schema.Schema{
 		Description: "Manages a tenant project variable in Octopus Deploy.",
 		Attributes: map[string]schema.Attribute{
-			"id": util.ResourceString().
-				Computed().
-				Description("The unique ID for this resource.").
-				PlanModifiers(stringplanmodifier.UseStateForUnknown()).
-				Build(),
+			"id": GetIdResourceSchema(),
 			"space_id": util.ResourceString().
 				Optional().
 				Computed().
diff --git a/octopusdeploy_framework/schemas/username_password_account.go b/octopusdeploy_framework/schemas/username_password_account.go
index 38b922f51..eb6bef2f9 100644
--- a/octopusdeploy_framework/schemas/username_password_account.go
+++ b/octopusdeploy_framework/schemas/username_password_account.go
@@ -20,7 +20,7 @@ func (u UsernamePasswordAccountSchema) GetResourceSchema() schema.Schema {
 	return schema.Schema{
 		Description: "This resource manages username-password accounts in Octopus Deploy.",
 		Attributes: map[string]schema.Attribute{
-			"id":                                util.ResourceString().Optional().Computed().PlanModifiers(stringplanmodifier.UseStateForUnknown()).Description("The unique ID for this resource.").Build(),
+			"id":                                GetIdResourceSchema(),
 			"space_id":                          util.ResourceString().Optional().Computed().PlanModifiers(stringplanmodifier.UseStateForUnknown()).Description("The space ID associated with this resource.").Build(),
 			"name":                              util.ResourceString().Required().Description("The name of the username-password account.").Build(),
 			"description":                       util.ResourceString().Optional().Computed().PlanModifiers(stringplanmodifier.UseStateForUnknown()).Default("").Description("The description of this username/password account.").Build(),
diff --git a/octopusdeploy_framework/schemas/variable.go b/octopusdeploy_framework/schemas/variable.go
index c41d6a8e0..9d2bb6cef 100644
--- a/octopusdeploy_framework/schemas/variable.go
+++ b/octopusdeploy_framework/schemas/variable.go
@@ -148,10 +148,7 @@ func (v VariableSchema) GetResourceSchema() resourceSchema.Schema {
 	return resourceSchema.Schema{
 		Description: util.GetResourceSchemaDescription(VariableResourceDescription),
 		Attributes: map[string]resourceSchema.Attribute{
-			SchemaAttributeNames.ID: resourceSchema.StringAttribute{
-				Description: "The ID of this resource.",
-				Computed:    true,
-			},
+			SchemaAttributeNames.ID:          GetIdResourceSchema(),
 			SchemaAttributeNames.Name:        GetNameResourceSchema(true),
 			SchemaAttributeNames.Description: GetDescriptionResourceSchema(VariableResourceDescription),
 			SchemaAttributeNames.SpaceID:     GetSpaceIdResourceSchema(VariableResourceDescription),