diff --git a/charts/atlantis/README.md b/charts/atlantis/README.md
index 42eec382..30fcad2f 100644
--- a/charts/atlantis/README.md
+++ b/charts/atlantis/README.md
@@ -88,7 +88,7 @@ extraManifests:
 | command | list | `[]` | Override the command field of the Atlantis container. |
 | commonLabels | object | `{}` | Common Labels for all resources created by this chart. |
 | config | string | `""` | Override atlantis main configuration by config map, ref: https://www.runatlantis.io/docs/using-slack-hooks.html#configuring-atlantis. Check values.yaml for examples. |
-| containerPort | int | `0` | [optional] Define the port you would like atlantis to run on. Defaults to 4141. |
+| containerPort | int | `0` | [optional] Define the port you would like atlantis to run on. When 0, the value of service.targetPort is used. |
 | containerSecurityContext | object | `{}` | Check values.yaml for examples. |
 | customPem | string | `""` | Allows to override the /etc/ssl/certs/ca-certificates.cer with your custom one. You have to create a secret with the specified name. |
 | dataStorage | string | `""` | DEPRECATED - Disk space available to check out repositories. Example: 5Gi. |
diff --git a/charts/atlantis/values.schema.json b/charts/atlantis/values.schema.json
index d1f2eafa..9bd743fc 100644
--- a/charts/atlantis/values.schema.json
+++ b/charts/atlantis/values.schema.json
@@ -270,11 +270,9 @@
     "containerPort": {
       "description": "Port for the Atlantis container, when necessary specify a value different from the Service's targetPort",
       "type": [
-        "string",
-        "integer",
-        "null"
+        "integer"
       ],
-      "default": null
+      "default": 0
     },
     "image": {
       "type": "object",
diff --git a/charts/atlantis/values.yaml b/charts/atlantis/values.yaml
index 1823bfac..52881a68 100644
--- a/charts/atlantis/values.yaml
+++ b/charts/atlantis/values.yaml
@@ -172,7 +172,7 @@ serviceAccountSecrets: {}
 # Default values for atlantis (override as needed).
 ## -------------------------- ##
 
-# -- (int) [optional] Define the port you would like atlantis to run on. Defaults to 4141.
+# -- (int) [optional] Define the port you would like atlantis to run on. When 0, the value of service.targetPort is used.
 containerPort: 0
 
 image: