diff --git a/Dockerfile b/Dockerfile
index f05c1326..c10f4c69 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -76,10 +76,10 @@ LABEL \
 ENV VPN_SERVICE_PROVIDER=pia \
     VPN_TYPE=openvpn \
     # Common VPN options
-    VPN_ENDPOINT_IP= \
-    VPN_ENDPOINT_PORT= \
     VPN_INTERFACE=tun0 \
     # OpenVPN
+    OPENVPN_ENDPOINT_IP= \
+    OPENVPN_ENDPOINT_PORT= \
     OPENVPN_PROTOCOL=udp \
     OPENVPN_USER= \
     OPENVPN_PASSWORD= \
@@ -93,6 +93,8 @@ ENV VPN_SERVICE_PROVIDER=pia \
     OPENVPN_PROCESS_USER=root \
     OPENVPN_CUSTOM_CONFIG= \
     # Wireguard
+    WIREGUARD_ENDPOINT_IP= \
+    WIREGUARD_ENDPOINT_PORT= \
     WIREGUARD_CONF_SECRETFILE=/run/secrets/wg0.conf \
     WIREGUARD_PRIVATE_KEY= \
     WIREGUARD_PRIVATE_KEY_SECRETFILE=/run/secrets/wireguard_private_key \
diff --git a/internal/configuration/settings/openvpnselection.go b/internal/configuration/settings/openvpnselection.go
index 9911b00c..519ac9e1 100644
--- a/internal/configuration/settings/openvpnselection.go
+++ b/internal/configuration/settings/openvpnselection.go
@@ -196,8 +196,8 @@ func (o *OpenVPNSelection) read(r *reader.Reader) (err error) {
 		return err
 	}
 
-	o.CustomPort, err = r.Uint16Ptr("VPN_ENDPOINT_PORT",
-		reader.RetroKeys("PORT", "OPENVPN_PORT"))
+	o.CustomPort, err = r.Uint16Ptr("OPENVPN_ENDPOINT_PORT",
+		reader.RetroKeys("PORT", "OPENVPN_PORT", "VPN_ENDPOINT_PORT"))
 	if err != nil {
 		return err
 	}
diff --git a/internal/configuration/settings/serverselection.go b/internal/configuration/settings/serverselection.go
index 82229a8c..ecfbaacd 100644
--- a/internal/configuration/settings/serverselection.go
+++ b/internal/configuration/settings/serverselection.go
@@ -385,8 +385,8 @@ func (ss *ServerSelection) read(r *reader.Reader,
 	vpnProvider, vpnType string) (err error) {
 	ss.VPN = vpnType
 
-	ss.TargetIP, err = r.NetipAddr("VPN_ENDPOINT_IP",
-		reader.RetroKeys("OPENVPN_TARGET_IP"))
+	ss.TargetIP, err = r.NetipAddr("OPENVPN_ENDPOINT_IP",
+		reader.RetroKeys("OPENVPN_TARGET_IP", "VPN_ENDPOINT_IP"))
 	if err != nil {
 		return err
 	}
diff --git a/internal/configuration/settings/wireguardselection.go b/internal/configuration/settings/wireguardselection.go
index 37fd8410..b2c42239 100644
--- a/internal/configuration/settings/wireguardselection.go
+++ b/internal/configuration/settings/wireguardselection.go
@@ -151,12 +151,12 @@ func (w WireguardSelection) toLinesNode() (node *gotree.Node) {
 }
 
 func (w *WireguardSelection) read(r *reader.Reader) (err error) {
-	w.EndpointIP, err = r.NetipAddr("VPN_ENDPOINT_IP", reader.RetroKeys("WIREGUARD_ENDPOINT_IP"))
+	w.EndpointIP, err = r.NetipAddr("WIREGUARD_ENDPOINT_IP", reader.RetroKeys("VPN_ENDPOINT_IP"))
 	if err != nil {
 		return err
 	}
 
-	w.EndpointPort, err = r.Uint16Ptr("VPN_ENDPOINT_PORT", reader.RetroKeys("WIREGUARD_ENDPOINT_PORT"))
+	w.EndpointPort, err = r.Uint16Ptr("WIREGUARD_ENDPOINT_PORT", reader.RetroKeys("VPN_ENDPOINT_PORT"))
 	if err != nil {
 		return err
 	}
diff --git a/internal/configuration/sources/files/reader.go b/internal/configuration/sources/files/reader.go
index 1809f4dc..477e39df 100644
--- a/internal/configuration/sources/files/reader.go
+++ b/internal/configuration/sources/files/reader.go
@@ -65,9 +65,9 @@ func (s *Source) Get(key string) (value string, isSet bool) {
 		return strPtrToStringIsSet(s.lazyLoadWireguardConf().Addresses)
 	case "wireguard_public_key":
 		return strPtrToStringIsSet(s.lazyLoadWireguardConf().PublicKey)
-	case "vpn_endpoint_ip":
+	case "wireguard_endpoint_ip":
 		return strPtrToStringIsSet(s.lazyLoadWireguardConf().EndpointIP)
-	case "vpn_endpoint_port":
+	case "wireguard_endpoint_port":
 		return strPtrToStringIsSet(s.lazyLoadWireguardConf().EndpointPort)
 	}
 
diff --git a/internal/configuration/sources/secrets/reader.go b/internal/configuration/sources/secrets/reader.go
index 59bc07cb..7de0590f 100644
--- a/internal/configuration/sources/secrets/reader.go
+++ b/internal/configuration/sources/secrets/reader.go
@@ -77,9 +77,9 @@ func (s *Source) Get(key string) (value string, isSet bool) {
 		} // else continue to read from individual secret file
 	case "wireguard_public_key":
 		return strPtrToStringIsSet(s.lazyLoadWireguardConf().PublicKey)
-	case "vpn_endpoint_ip":
+	case "wireguard_endpoint_ip":
 		return strPtrToStringIsSet(s.lazyLoadWireguardConf().EndpointIP)
-	case "vpn_endpoint_port":
+	case "wireguard_endpoint_port":
 		return strPtrToStringIsSet(s.lazyLoadWireguardConf().EndpointPort)
 	}