diff --git a/docker-compose.dedicated-server.ghcr.yml b/docker-compose.dedicated-server.ghcr.yml
index 8bcaf484..7a9a95b2 100644
--- a/docker-compose.dedicated-server.ghcr.yml
+++ b/docker-compose.dedicated-server.ghcr.yml
@@ -1,12 +1,12 @@
 services:
   minecraft-lce-dedicated-server:
-    image: ghcr.io/kuwacom/minecraft-lce-dedicated-server:nightly
+    image: ghcr.io/smartcmd/minecraft-lce-dedicated-server:nightly
     container_name: minecraft-lce-dedicated-server
     restart: unless-stopped
     tty: true
     stdin_open: true
     environment:
-      TZ: ${TZ:-Asia/Tokyo}
+      TZ: ${TZ:-Etc/UTC}
       WINEARCH: win64
       WINEPREFIX: /var/opt/wineprefix64
       WINEDEBUG: -all
@@ -15,6 +15,9 @@ services:
       # minimum required virtual screen
       XVFB_DISPLAY: ${XVFB_DISPLAY:-:99}
       XVFB_SCREEN: ${XVFB_SCREEN:-720x1280x16}
+      # ip & port the server will run on
+      SERVER_BIND_IP: ${SERVER_BIND_IP:-0.0.0.0}
+      SERVER_PORT: ${SERVER_PORT:-25565}
     volumes:
       # - wineprefix64:/var/opt/wineprefix64
       - ./server-data:/srv/persist
diff --git a/docker-compose.dedicated-server.yml b/docker-compose.dedicated-server.yml
index 4a0d3313..3dbe8bf6 100644
--- a/docker-compose.dedicated-server.yml
+++ b/docker-compose.dedicated-server.yml
@@ -10,7 +10,7 @@ services:
     tty: true
     stdin_open: true
     environment:
-      TZ: ${TZ:-Asia/Tokyo}
+      TZ: ${TZ:-Etc/UTC}
       WINEARCH: win64
       WINEPREFIX: /var/opt/wineprefix64
       WINEDEBUG: -all
@@ -18,7 +18,10 @@ services:
       SERVER_CLI_INPUT_MODE: ${SERVER_CLI_INPUT_MODE:-stream}
       # minimum required virtual screen
       XVFB_DISPLAY: ${XVFB_DISPLAY:-:99}
-      XVFB_SCREEN: ${XVFB_SCREEN:-64x64x16}
+      XVFB_SCREEN: ${XVFB_SCREEN:-720x1280x16}
+      # ip & port the server will run on
+      SERVER_BIND_IP: ${SERVER_BIND_IP:-0.0.0.0}
+      SERVER_PORT: ${SERVER_PORT:-25565}
     volumes:
       # - wineprefix64:/var/opt/wineprefix64
       - ./server-data:/srv/persist
diff --git a/docker/dedicated-server/entrypoint.sh b/docker/dedicated-server/entrypoint.sh
index 26b40da9..0eece274 100644
--- a/docker/dedicated-server/entrypoint.sh
+++ b/docker/dedicated-server/entrypoint.sh
@@ -3,9 +3,8 @@ set -euo pipefail
 
 SERVER_DIR="/srv/mc"
 SERVER_EXE="Minecraft.Server.exe"
-# ip & port are fixed since they run inside the container
-SERVER_PORT="25565"
-SERVER_BIND_IP="0.0.0.0"
+SERVER_PORT="${SERVER_PORT:-25565}"
+SERVER_BIND_IP="${SERVER_BIND_IP:-0.0.0.0}"
 
 PERSIST_DIR="/srv/persist"
 WINE_CMD=""