diff --git a/go/cmd/dolt/doltversion/version.go b/go/cmd/dolt/doltversion/version.go
index 7a4aa19bfc..8276933f59 100644
--- a/go/cmd/dolt/doltversion/version.go
+++ b/go/cmd/dolt/doltversion/version.go
@@ -16,5 +16,5 @@
 package doltversion
 
 const (
-	Version = "1.58.6"
+	Version = "1.58.7"
 )
diff --git a/go/libraries/doltcore/servercfg/testdata/minver_validation.txt b/go/libraries/doltcore/servercfg/testdata/minver_validation.txt
index 893080c831..e700316ce2 100644
--- a/go/libraries/doltcore/servercfg/testdata/minver_validation.txt
+++ b/go/libraries/doltcore/servercfg/testdata/minver_validation.txt
@@ -38,7 +38,7 @@ CfgDirStr *string 0.0.0 cfg_dir,omitempty
 RemotesapiConfig servercfg.RemotesapiYAMLConfig 0.0.0 remotesapi,omitempty
 -Port_ *int 0.0.0 port,omitempty
 -ReadOnly_ *bool 1.30.5 read_only,omitempty
-MCPServer *servercfg.MCPServerYAMLConfig TBD mcp_server,omitempty
+MCPServer *servercfg.MCPServerYAMLConfig 1.58.7 mcp_server,omitempty
 -Port *int 0.0.0 port,omitempty
 -User *string 0.0.0 user,omitempty
 -Password *string 0.0.0 password,omitempty
diff --git a/go/libraries/doltcore/servercfg/yaml_config.go b/go/libraries/doltcore/servercfg/yaml_config.go
index 1f6df4fd08..2e99bba4d7 100644
--- a/go/libraries/doltcore/servercfg/yaml_config.go
+++ b/go/libraries/doltcore/servercfg/yaml_config.go
@@ -148,7 +148,7 @@ type YAMLConfig struct {
 	DataDirStr        *string                `yaml:"data_dir,omitempty"`
 	CfgDirStr         *string                `yaml:"cfg_dir,omitempty"`
 	RemotesapiConfig  RemotesapiYAMLConfig   `yaml:"remotesapi,omitempty"`
-	MCPServer         *MCPServerYAMLConfig   `yaml:"mcp_server,omitempty" minver:"TBD"`
+	MCPServer         *MCPServerYAMLConfig   `yaml:"mcp_server,omitempty" minver:"1.58.7"`
 	PrivilegeFile     *string                `yaml:"privilege_file,omitempty"`
 	BranchControlFile *string                `yaml:"branch_control_file,omitempty"`
 	// TODO: Rename to UserVars_