coder
diff --git a/‎cli/testdata/coder_server_--help.golden
+2-3 b/‎cli/testdata/coder_server_--help.golden
+2-3
diff --git a/‎cli/testdata/server-config.yaml.golden
+3 b/‎cli/testdata/server-config.yaml.golden
+3
diff --git a/‎coderd/apidoc/docs.go
+3 b/‎coderd/apidoc/docs.go
+3
diff --git a/‎coderd/apidoc/swagger.json
+3 b/‎coderd/apidoc/swagger.json
+3
diff --git a/‎codersdk/deployment.go
+6-5 b/‎codersdk/deployment.go
+6-5
diff --git a/‎docs/reference/api/general.md
+1 b/‎docs/reference/api/general.md
+1
diff --git a/‎docs/reference/api/schemas.md
+3 b/‎docs/reference/api/schemas.md
+3
diff --git a/‎docs/reference/cli/server.md
+11 b/‎docs/reference/cli/server.md
+11
diff --git a/‎enterprise/cli/testdata/coder_server_--help.golden
+2-3 b/‎enterprise/cli/testdata/coder_server_--help.golden
+2-3
diff --git a/‎site/src/api/typesGenerated.ts
+1 b/‎site/src/api/typesGenerated.ts
+1
@@ -624,9 +624,8 @@ These options are only available in the Enterprise Edition.
           Enables SCIM and sets the authentication header for the built-in SCIM
           server. New users are automatically created with OIDC authentication.
 
-      --scim-organization string, $CODER_SCIM_ORGANIZATION (default: default)
-          Enables SCIM and sets the authentication header for the built-in SCIM
-          server. New users are automatically created with OIDC authentication.
+      --scim-organization-name string, $CODER_SCIM_ORGANIZATION_NAME (default: default)
+          Specifies the organization name to create new SCIM users in.
 
 ———
 Run `coder --help` for a list of global options.
@@ -448,6 +448,9 @@ sshKeygenAlgorithm: ed25519
 # URL to use for agent troubleshooting when not set in the template.
 # (default: https://coder.com/docs/templates/troubleshooting, type: url)
 agentFallbackTroubleshootingURL: https://coder.com/docs/templates/troubleshooting
+# Specifies the organization name to create new SCIM users in.
+# (default: default, type: string)
+scimOrganizationName: default
 # Disable workspace apps that are not served from subdomains. Path-based apps can
 # make requests to the Coder API and pose a security risk when the workspace
 # serves malicious JavaScript. This is recommended for security purposes if a
 
@@ -2164,13 +2164,14 @@ when required by your organization's security policy.`,
 			Value:       &c.SCIMAPIKey,
 		},
 		{
-			Name:        "SCIM Organization",
-			Description: "Enables SCIM and sets the authentication header for the built-in SCIM server. New users are automatically created with OIDC authentication.",
-			Flag:        "scim-organization",
-			Env:         "CODER_SCIM_ORGANIZATION",
-			Annotations: serpent.Annotations{}.Mark(annotationEnterpriseKey, "true").Mark(annotationSecretKey, "true"),
+			Name:        "SCIM Organization Name",
+			Description: "Specifies the organization name to create new SCIM users in.",
+			Flag:        "scim-organization-name",
+			Env:         "CODER_SCIM_ORGANIZATION_NAME",
+			Annotations: serpent.Annotations{}.Mark(annotationEnterpriseKey, "true"),
 			Value:       &c.SCIMOrganization,
 			Default:     "default",
+			YAML:        "scimOrganizationName",
 		},
 		{
 			Name:        "External Token Encryption Keys",
 
@@ -625,9 +625,8 @@ These options are only available in the Enterprise Edition.
           Enables SCIM and sets the authentication header for the built-in SCIM
           server. New users are automatically created with OIDC authentication.
 
-      --scim-organization string, $CODER_SCIM_ORGANIZATION (default: default)
-          Enables SCIM and sets the authentication header for the built-in SCIM
-          server. New users are automatically created with OIDC authentication.
+      --scim-organization-name string, $CODER_SCIM_ORGANIZATION_NAME (default: default)
+          Specifies the organization name to create new SCIM users in.
 
 ———
 Run `coder --help` for a list of global options.