diff --git a/auto-configurations/models/chat/client/spring-ai-autoconfigure-model-chat-client/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/auto-configurations/models/chat/client/spring-ai-autoconfigure-model-chat-client/src/main/resources/META-INF/additional-spring-configuration-metadata.json
new file mode 100644
index 00000000000..aec436ff817
--- /dev/null
+++ b/auto-configurations/models/chat/client/spring-ai-autoconfigure-model-chat-client/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -0,0 +1,52 @@
+{
+  "properties": [
+    {
+      "name": "spring.ai.model.chat",
+      "type": "java.lang.String",
+      "description": "The primary ChatModel to autoconfigure. If not set, each ChatModel auto-configuration is enabled by default.",
+      "defaultValue": ""
+    },
+    {
+      "name": "spring.ai.model.embedding",
+      "type": "java.lang.String",
+      "description": "The primary EmbeddingModel to autoconfigure. If not set, each EmbeddingModel auto-configuration is enabled by default.",
+      "defaultValue": ""
+    },
+    {
+      "name": "spring.ai.model.embedding.text",
+      "type": "java.lang.String",
+      "description": "The primary EmbeddingModel for text embeddings to autoconfigure. If not set, each text EmbeddingModel auto-configuration is enabled by default.",
+      "defaultValue": ""
+    },
+    {
+      "name": "spring.ai.model.embedding.multimodal",
+      "type": "java.lang.String",
+      "description": "The primary EmbeddingModel for multimodal embeddings to autoconfigure. If not set, each multimodal EmbeddingModel auto-configuration is enabled by default.",
+      "defaultValue": ""
+    },
+    {
+      "name": "spring.ai.model.image",
+      "type": "java.lang.String",
+      "description": "The primary ImageModel to autoconfigure. If not set, each ImageModel auto-configuration is enabled by default.",
+      "defaultValue": ""
+    },
+    {
+      "name": "spring.ai.model.audio.transcription",
+      "type": "java.lang.String",
+      "description": "The primary TranscriptionModel to autoconfigure. If not set, each TranscriptionModel auto-configuration is enabled by default.",
+      "defaultValue": ""
+    },
+    {
+      "name": "spring.ai.model.audio.speech",
+      "type": "java.lang.String",
+      "description": "The primary SpeechModel to autoconfigure. If not set, each SpeechModel auto-configuration is enabled by default.",
+      "defaultValue": ""
+    },
+    {
+      "name": "spring.ai.model.moderation",
+      "type": "java.lang.String",
+      "description": "The primary ModerationModel to autoconfigure. If not set, each ModerationModel auto-configuration is enabled by default.",
+      "defaultValue": ""
+    }
+  ]
+}
diff --git a/spring-ai-docs/src/main/antora/modules/ROOT/pages/upgrade-notes.adoc b/spring-ai-docs/src/main/antora/modules/ROOT/pages/upgrade-notes.adoc
index e9cecc0d42a..928a1b284be 100644
--- a/spring-ai-docs/src/main/antora/modules/ROOT/pages/upgrade-notes.adoc
+++ b/spring-ai-docs/src/main/antora/modules/ROOT/pages/upgrade-notes.adoc
@@ -150,6 +150,26 @@ CreateMessageResult result = exchange.createMessage(new CreateMessageRequest(...
 
 For a complete guide to migrating MCP code, refer to the https://github.com/spring-projects/spring-ai/blob/main/spring-ai-docs/src/main/antora/modules/ROOT/pages/mcp-migration.adoc[MCP Migration Guide].
 
+=== Enabling/Disabling Model Auto-Configuration
+
+The following configuration properties for enabling/disabling model auto-configuration have been removed:
+
+* `spring.ai.<provider>.chat.enabled`
+* `spring.ai.<provider>.embedding.enabled`
+* `spring.ai.<provider>.image.enabled`
+* `spring.ai.<provider>.moderation.enabled`
+
+As a replacement, the following properties can be used to choose for which model provider the auto-configuration should be enabled. If no value is specified, auto-configurations for all model providers are enabled by default. If a certain value is defined (e.g. `mistral`), then only the auto-configuration for that model provider will be enabled. You can refer to the https://github.com/spring-projects/spring-ai/blob/main/spring-ai-model/src/main/java/org/springframework/ai/model/SpringAIModels.java[SpringAiModels.java] enumeration for a list of well-known values for the model providers.
+
+* `spring.ai.model.audio.speech=<model-provider>`
+* `spring.ai.model.audio.transcription=<model-provider>`
+* `spring.ai.model.chat=<model-provider>`
+* `spring.ai.model.embedding=<model-provider>`
+* `spring.ai.model.embedding.multimodal=<model-provider>`
+* `spring.ai.model.embedding.text=<model-provider>`
+* `spring.ai.model.image=<model-provider>`
+* `spring.ai.model.moderation=<model-provider>`
+
 === Automating upgrading using AI
 
 You can automate the upgrade process to 1.0.0-M7 using the Claude Code CLI tool with a provided prompt: