diff --git a/roles/openvpn/server/files/ccd/notifs-web01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/notifs-web01.iad2.fedoraproject.org
index 55e6ccb21c..3aae1d284d 100644
--- a/roles/openvpn/server/files/ccd/notifs-web01.iad2.fedoraproject.org
+++ b/roles/openvpn/server/files/ccd/notifs-web01.iad2.fedoraproject.org
@@ -1,2 +1,2 @@
 # ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.20.80 192.168.0.80
+ifconfig-push 192.168.1.80 192.168.0.80
diff --git a/roles/openvpn/server/files/ccd/notifs-web01.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/notifs-web01.phx2.fedoraproject.org
deleted file mode 100644
index 3aae1d284d..0000000000
--- a/roles/openvpn/server/files/ccd/notifs-web01.phx2.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.80 192.168.0.80
diff --git a/roles/openvpn/server/files/ccd/notifs-web02.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/notifs-web02.phx2.fedoraproject.org
deleted file mode 100644
index 1dd2f4e173..0000000000
--- a/roles/openvpn/server/files/ccd/notifs-web02.phx2.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.88 192.168.0.88
diff --git a/roles/openvpn/server/files/ccd/oci-candidate-registry01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/oci-candidate-registry01.iad2.fedoraproject.org
index 7acb148c4c..6a8829c7bb 100644
--- a/roles/openvpn/server/files/ccd/oci-candidate-registry01.iad2.fedoraproject.org
+++ b/roles/openvpn/server/files/ccd/oci-candidate-registry01.iad2.fedoraproject.org
@@ -1,2 +1,2 @@
 # ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.20.93 192.168.0.93
+ifconfig-push 192.168.1.93 192.168.0.93
diff --git a/roles/openvpn/server/files/ccd/oci-candidate-registry01.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/oci-candidate-registry01.phx2.fedoraproject.org
deleted file mode 100644
index 6a8829c7bb..0000000000
--- a/roles/openvpn/server/files/ccd/oci-candidate-registry01.phx2.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.93 192.168.0.93
diff --git a/roles/openvpn/server/files/ccd/oci-registry01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/oci-registry01.iad2.fedoraproject.org
index 65954e7169..cf4a1082c2 100644
--- a/roles/openvpn/server/files/ccd/oci-registry01.iad2.fedoraproject.org
+++ b/roles/openvpn/server/files/ccd/oci-registry01.iad2.fedoraproject.org
@@ -1,2 +1,2 @@
 # ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.20.168 192.168.0.168
+ifconfig-push 192.168.1.168 192.168.0.168
diff --git a/roles/openvpn/server/files/ccd/oci-registry01.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/oci-registry01.phx2.fedoraproject.org
deleted file mode 100644
index cf4a1082c2..0000000000
--- a/roles/openvpn/server/files/ccd/oci-registry01.phx2.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.168 192.168.0.168
diff --git a/roles/openvpn/server/files/ccd/oci-registry02.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/oci-registry02.phx2.fedoraproject.org
deleted file mode 100644
index 86f8b27242..0000000000
--- a/roles/openvpn/server/files/ccd/oci-registry02.phx2.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.169 192.168.0.169