diff --git a/README.md b/README.md
index 2af76b156..ff78db3b8 100644
--- a/README.md
+++ b/README.md
@@ -57,8 +57,7 @@ services:
          - TZ=UTC
          - ADMIN_PASSWORD="adminPasswordHere"
          - COMMUNITY=false  # Enable this if you want your server to show up in the community servers tab, USE WITH SERVER_PASSWORD!
-         # Enable the environment variables below if you have COMMUNITY=true
-         # - SERVER_NAME="World of Pals"
+         - SERVER_NAME="World of Pals"
       volumes:
          - ./palworld:/palworld/
 ```
@@ -84,6 +83,7 @@ docker run -d \
     -e ADMIN_PASSWORD="adminPasswordHere" \
     -e SERVER_PASSWORD="worldofpals" \
     -e COMMUNITY=false \
+    -e SERVER_NAME="World of Pals" \
     --restart unless-stopped \
     thijsvanloef/palworld-server-docker:latest
 
@@ -112,15 +112,15 @@ It is highly recommended you set the following environment values before startin
 | Variable         | Info                                                                                                                                                                                               | Default Values | Allowed Values                                                                                             |
 |------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------|------------------------------------------------------------------------------------------------------------|
 | TZ               | Timezone used for time stamping backup server                                                                                                                                                      | UTC            | See [TZ Identifiers](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#Time_Zone_abbreviations) |
-| PLAYERS*         | Max amount of players that are able to join the server                                                                                                                                             | 16             | 1-31                                                                                                       |
+| PLAYERS*         | Max amount of players that are able to join the server                                                                                                                                             | 16             | 1-32                                                                                                       |
 | PORT*            | UDP port that the server will expose                                                                                                                                                               | 8211           | 1024-65535                                                                                                 |
 | PUID*            | The uid of the user the server should run as                                                                                                                                                       | 1000           | !0                                                                                                         |
 | PGID*            | The gid of the group the server should run as                                                                                                                                                      | 1000           | !0                                                                                                         |
 | MULTITHREADING** | Improves performance in multi-threaded CPU environments. It is effective up to a maximum of about 4 threads, and allocating more than this number of threads does not make much sense.             | false          | true/false                                                                                                 |
 | COMMUNITY        | Whether or not the server shows up in the community server browser (USE WITH SERVER_PASSWORD)                                                                                                      | false          | true/false                                                                                                 |
-| PUBLIC_IP        | You can manually specify the global IP address of the network on which the server running.If not specified, it will be detected automatically. If it does not work well, try manual configuration. |                | x.x.x.x                                                                                                    |
-| PUBLIC_PORT      | You can manually specify the port number of the network on which the server running.If not specified, it will be detected automatically. If it does not work well, try manual configuration.       |                | 1024-65535                                                                                                 |
-| SERVER_NAME      | A name for your community server                                                                                                                                                                   |                | "string"                                                                                                   |
+| PUBLIC_IP        | You can manually specify the global IP address of the network on which the server running. If not specified, it will be detected automatically. If it does not work well, try manual configuration. |                | x.x.x.x                                                                                                    |
+| PUBLIC_PORT      | You can manually specify the port number of the network on which the server running. If not specified, it will be detected automatically. If it does not work well, try manual configuration.       |                | 1024-65535                                                                                                 |
+| SERVER_NAME      | A name for your server               |                | "string"                                                                                                   |
 | SERVER_PASSWORD  | Secure your community server with a password                                                                                                                                                       |                | "string"                                                                                                   |
 | ADMIN_PASSWORD   | Secure administration access in the server with a password                                                                                                                                         |                | "string"                                                                                                   |
 | UPDATE_ON_BOOT** | Update/Install the server when the docker container starts (THIS HAS TO BE ENABLED THE FIRST TIME YOU RUN THE CONTAINER)                                                                           | true           | true/false                                                                                                 |
diff --git a/docker-compose.yml b/docker-compose.yml
index 21aff674f..a3b8e2daa 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,7 +5,7 @@ services:
       container_name: palworld-server
       ports:
         - 8211:8211/udp
-        - 27015:27015/udp
+        - 27015:27015/udp # Required if you want your server to show up in the community servers tab 
       environment:
          - PUID=1000
          - PGID=1000
@@ -18,7 +18,6 @@ services:
          - TZ=UTC
          - ADMIN_PASSWORD="adminPasswordHere"
          - COMMUNITY=false  # Enable this if you want your server to show up in the community servers tab, USE WITH SERVER_PASSWORD!
-         # Enable the environment variables below if you have COMMUNITY=true
-         # - SERVER_NAME="World of Pals"
+         - SERVER_NAME="World of Pals"
       volumes:
          - ./palworld:/palworld/
diff --git a/k8s/configmap.yaml b/k8s/configmap.yaml
index 266b3402d..be8d7aa82 100644
--- a/k8s/configmap.yaml
+++ b/k8s/configmap.yaml
@@ -7,13 +7,13 @@ data:
   PGID: "1000"
   PORT: "8211" # Optional but recommended
   PLAYERS: "16" # Optional but recommended
+  SERVER_PASSWORD: "worldofpals" # Optional but recommended
   MULTITHREADING: "true"
   RCON_ENABLED: "true"
   RCON_PORT: "25575"
+  TZ: UTC
   COMMUNITY: "false"  # Enable this if you want your server to show up in the community servers tab, USE WITH SERVER_PASSWORD!
-  # Enable the environment variables below if you have COMMUNITY=true
-  # SERVER_PASSWORD: "yourServerPassword"
-  SERVER_NAME: "Server_Name" # Note, it seems spaces are not supported, so use underlines.
+  SERVER_NAME: "World of Pals"
 ---
 apiVersion: v1
 kind: ConfigMap