diff --git a/docker-compose.yaml b/docker-compose.yaml
index 33cc294..2e1465a 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -2,9 +2,6 @@ version: '3'
 
 services:
   wg:
-    build:
-      context: .
-      dockerfile: Dockerfile
     image: ngoduykhanh/wireguard-ui:latest
     container_name: wgui
     ports:
@@ -14,4 +11,4 @@ services:
       options:
         max-size: 50m
     volumes:
-      - /etc/wireguard/wg0.conf:/etc/wireguard/wg0.conf
+      - /etc/wireguard:/etc/wireguard
diff --git a/util/db.go b/util/db.go
index 606d84e..99c16bf 100644
--- a/util/db.go
+++ b/util/db.go
@@ -95,7 +95,7 @@ func InitDB() error {
 		}
 
 		globalSetting := new(model.GlobalSetting)
-		globalSetting.EndpointAddress = fmt.Sprintf("%s:%d", publicInterface.IPAddress, defaultServerPort)
+		globalSetting.EndpointAddress = publicInterface.IPAddress
 		globalSetting.DNSServers = []string{defaultDNS}
 		globalSetting.MTU = defaultMTU
 		globalSetting.PersistentKeepalive = defaultPersistentKeepalive