diff --git a/internal/provider/cyberghost.go b/internal/provider/cyberghost.go
index 558d2890..93bfb465 100644
--- a/internal/provider/cyberghost.go
+++ b/internal/provider/cyberghost.go
@@ -79,11 +79,13 @@ func (c *cyberghost) BuildConf(connection models.OpenVPNConnection,
 		"persist-key",
 		"persist-tun",
 		"remote-cert-tls server",
+		"ping 10",
+		"ping-exit 60",
+		"ping-timer-rem",
 
 		// Cyberghost specific
 		// "redirect-gateway def1",
 		"ncp-disable",
-		"ping 5",
 		"explicit-exit-notify 2",
 		"script-security 2",
 		"route-delay 5",
diff --git a/internal/provider/mullvad.go b/internal/provider/mullvad.go
index 48aaef31..e9ab85d7 100644
--- a/internal/provider/mullvad.go
+++ b/internal/provider/mullvad.go
@@ -85,10 +85,11 @@ func (m *mullvad) BuildConf(connection models.OpenVPNConnection,
 		"nobind",
 		"persist-key",
 		"remote-cert-tls server",
+		"ping 10",
+		"ping-exit 60",
+		"ping-timer-rem",
 
 		// Mullvad specific
-		"ping 10",
-		"ping-restart 60",
 		"sndbuf 524288",
 		"rcvbuf 524288",
 		"tls-cipher TLS-DHE-RSA-WITH-AES-256-GCM-SHA384:TLS-DHE-RSA-WITH-AES-256-CBC-SHA",
diff --git a/internal/provider/nordvpn.go b/internal/provider/nordvpn.go
index 93798afd..0d8b3f8a 100644
--- a/internal/provider/nordvpn.go
+++ b/internal/provider/nordvpn.go
@@ -99,14 +99,14 @@ func (n *nordvpn) BuildConf(connection models.OpenVPNConnection,
 		"nobind",
 		"persist-key",
 		"remote-cert-tls server",
+		"ping 10",
+		"ping-exit 60",
+		"ping-timer-rem",
 
 		// Nordvpn specific
 		"tun-mtu 1500",
 		"tun-mtu-extra 32",
 		"mssfix " + strconv.Itoa(int(settings.MSSFix)),
-		"ping 15",
-		"ping-restart 0",
-		"ping-timer-rem",
 		"reneg-sec 0",
 		"comp-lzo no",
 		"fast-io",
diff --git a/internal/provider/piav4.go b/internal/provider/piav4.go
index 78e8ad87..2b0cb795 100644
--- a/internal/provider/piav4.go
+++ b/internal/provider/piav4.go
@@ -138,9 +138,11 @@ func (p *pia) BuildConf(connection models.OpenVPNConnection,
 		"nobind",
 		"persist-key",
 		"remote-cert-tls server",
+		"ping 10",
+		"ping-exit 60",
+		"ping-timer-rem",
 
 		// PIA specific
-		"ping 300", // Ping every 5 minutes to prevent a timeout error
 		"reneg-sec 0",
 		"compress", // allow PIA server to choose the compression to use
 
diff --git a/internal/provider/privado.go b/internal/provider/privado.go
index 96c7bba4..b2b39214 100644
--- a/internal/provider/privado.go
+++ b/internal/provider/privado.go
@@ -85,6 +85,9 @@ func (s *privado) BuildConf(connection models.OpenVPNConnection,
 		"dev tun",
 		"nobind",
 		"persist-key",
+		"ping 10",
+		"ping-exit 60",
+		"ping-timer-rem",
 
 		// Privado specific
 		"tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA",
diff --git a/internal/provider/purevpn.go b/internal/provider/purevpn.go
index a38a8c94..41363136 100644
--- a/internal/provider/purevpn.go
+++ b/internal/provider/purevpn.go
@@ -85,6 +85,9 @@ func (p *purevpn) BuildConf(connection models.OpenVPNConnection,
 		"nobind",
 		"persist-key",
 		"remote-cert-tls server",
+		"ping 10",
+		"ping-exit 60",
+		"ping-timer-rem",
 
 		// Purevpn specific
 		"key-direction 1",
diff --git a/internal/provider/surfshark.go b/internal/provider/surfshark.go
index 85d2cddd..34dc23dc 100644
--- a/internal/provider/surfshark.go
+++ b/internal/provider/surfshark.go
@@ -95,14 +95,14 @@ func (s *surfshark) BuildConf(connection models.OpenVPNConnection,
 		"nobind",
 		"persist-key",
 		"remote-cert-tls server",
+		"ping 10",
+		"ping-exit 60",
+		"ping-timer-rem",
 
 		// Surfshark specific
 		"tun-mtu 1500",
 		"tun-mtu-extra 32",
 		"mssfix " + strconv.Itoa(int(settings.MSSFix)),
-		"ping 15",
-		"ping-restart 60",
-		"ping-timer-rem",
 		"reneg-sec 0",
 		"fast-io",
 		"key-direction 1",
diff --git a/internal/provider/vyprvpn.go b/internal/provider/vyprvpn.go
index 1f3e0014..c736aa90 100644
--- a/internal/provider/vyprvpn.go
+++ b/internal/provider/vyprvpn.go
@@ -85,10 +85,12 @@ func (v *vyprvpn) BuildConf(connection models.OpenVPNConnection,
 		"nobind",
 		"persist-key",
 		"remote-cert-tls server",
+		"ping 10",
+		"ping-exit 60",
+		"ping-timer-rem",
 
 		// Vyprvpn specific
 		"comp-lzo",
-		"keepalive 10 60",
 		// "verify-x509-name lu1.vyprvpn.com name",
 		"tls-cipher TLS-ECDHE-RSA-WITH-AES-256-GCM-SHA384:TLS-DHE-RSA-WITH-AES-256-CBC-SHA256:TLS-DHE-RSA-WITH-AES-256-CBC-SHA", //nolint:lll
 
diff --git a/internal/provider/windscribe.go b/internal/provider/windscribe.go
index d35d9d1d..6ac55bf8 100644
--- a/internal/provider/windscribe.go
+++ b/internal/provider/windscribe.go
@@ -88,6 +88,9 @@ func (w *windscribe) BuildConf(connection models.OpenVPNConnection,
 		"nobind",
 		"persist-key",
 		"remote-cert-tls server",
+		"ping 10",
+		"ping-exit 60",
+		"ping-timer-rem",
 
 		// Windscribe specific
 		"comp-lzo",