diff --git a/src/lib/WireGuard.js b/src/lib/WireGuard.js
index b2f4a0fe..b4cd2f82 100644
--- a/src/lib/WireGuard.js
+++ b/src/lib/WireGuard.js
@@ -98,8 +98,8 @@ module.exports = class WireGuard {
 # Server
 [Interface]
 PrivateKey = ${config.server.privateKey}
-Address = ${config.server.address}/24
-ListenPort = 51820
+Address = ${config.server.address}${address.subnet}
+ListenPort = WG_PORT
 PreUp = ${WG_PRE_UP}
 PostUp = ${WG_POST_UP}
 PreDown = ${WG_PRE_DOWN}