diff --git a/charts/mattermost-team-edition/README.md b/charts/mattermost-team-edition/README.md
index 44a51e3f..95f10e1d 100644
--- a/charts/mattermost-team-edition/README.md
+++ b/charts/mattermost-team-edition/README.md
@@ -124,7 +124,7 @@ The following table lists the configurable parameters of the Mattermost Team Edi
 
 Parameter                             | Description                                                                                     | Default
 ---                                   | ---                                                                                             | ---
-`configJSON`                          | The `config.json` configuration to be used by the mattermost server. The values you provide will by using Helm's merging behavior override individual default values only. See the [example configuration](#example-configuration) and the [Mattermost documentation](https://docs.mattermost.com/administration/config-settings.html) for details. |  See `configJSON` in [values.yaml](https://github.com/helm/charts/blob/master/stable/mattermost-team-edition/values.yaml)
+`configJSON`                          | The `config.json` configuration to be used by the mattermost server. The values you provide will by using Helm's merging behavior override individual default values only. See the [example configuration](#example-configuration) and the [Mattermost documentation](https://docs.mattermost.com/configure/configuration-settings.html) for details. |  See `configJSON` in [values.yaml](https://github.com/helm/charts/blob/master/stable/mattermost-team-edition/values.yaml)
 `image.repository`                    | Container image repository                                                                      | `mattermost/mattermost-team-edition`
 `image.tag`                           | Container image tag                                                                             | `5.39.0`
 `image.imagePullPolicy`               | Container image pull policy                                                                     | `IfNotPresent`
@@ -180,11 +180,9 @@ ingress:
   hosts:
     - mattermost.example.com
 
-configJSON:
-  ServiceSettings:
-    SiteURL: "https://mattermost.example.com"
-  TeamSettings:
-    SiteName: "Mattermost on Example.com"
+config:
+  MM_SERVICESETTINGS_SITEURL: "https://mattermost.example.com"
+  MM_TEAMSETTINGS_SITENAME: "Mattermost on Example.com"
 ```
 
 ### External Databases
diff --git a/charts/mattermost-team-edition/values.yaml b/charts/mattermost-team-edition/values.yaml
index f8b644e4..1f519e18 100644
--- a/charts/mattermost-team-edition/values.yaml
+++ b/charts/mattermost-team-edition/values.yaml
@@ -214,7 +214,7 @@ serviceAccount:
 
 ## Configuration
 ## The config here will be injected as environment variables in the deployment
-## Please refer to https://docs.mattermost.com/administration/config-settings.html#configuration-in-database for more information
+## Please refer to https://docs.mattermost.com/configure/configuration-settings.html#configuration-in-database for more information
 ## You can add any config here, but need to respect the format: MM_<GROUPSECTION>_<SETTING>. ie: MM_SERVICESETTINGS_ENABLECOMMANDS: false
 config:
   MM_PLUGINSETTINGS_CLIENTDIRECTORY: "./client/plugins"