diff --git a/Dockerfile b/Dockerfile
index c5a64707..debda4b4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -70,6 +70,7 @@ ENV VPNSP=pia \
     VPN_TYPE=openvpn \
     # Common VPN options
     VPN_ENDPOINT_IP= \
+    VPN_ENDPOINT_PORT= \
     # OpenVPN
     OPENVPN_PROTOCOL=udp \
     OPENVPN_USER= \
@@ -85,13 +86,11 @@ ENV VPNSP=pia \
     OPENVPN_IPV6=off \
     OPENVPN_CUSTOM_CONFIG= \
     OPENVPN_INTERFACE=tun0 \
-    OPENVPN_PORT= \
     # Wireguard
     WIREGUARD_PRIVATE_KEY= \
     WIREGUARD_PRESHARED_KEY= \
     WIREGUARD_PUBLIC_KEY= \
     WIREGUARD_ADDRESS= \
-    WIREGUARD_ENDPOINT_PORT= \
     WIREGUARD_INTERFACE=wg0 \
     # VPN server filtering
     REGION= \