diff --git a/roles/openvpn/server/files/ccd/os-node01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/os-node01.iad2.fedoraproject.org
index e4b2c8fbe0..431d97ec5d 100644
--- a/roles/openvpn/server/files/ccd/os-node01.iad2.fedoraproject.org
+++ b/roles/openvpn/server/files/ccd/os-node01.iad2.fedoraproject.org
@@ -1,2 +1,2 @@
 # ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.20.173 192.168.0.173
+ifconfig-push 192.168.1.173 192.168.0.173
diff --git a/roles/openvpn/server/files/ccd/os-node01.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/os-node01.phx2.fedoraproject.org
deleted file mode 100644
index 431d97ec5d..0000000000
--- a/roles/openvpn/server/files/ccd/os-node01.phx2.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.173 192.168.0.173
diff --git a/roles/openvpn/server/files/ccd/os-node02.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/os-node02.iad2.fedoraproject.org
index 08251ac51e..0831a99310 100644
--- a/roles/openvpn/server/files/ccd/os-node02.iad2.fedoraproject.org
+++ b/roles/openvpn/server/files/ccd/os-node02.iad2.fedoraproject.org
@@ -1,2 +1,2 @@
 # ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.20.174 192.168.0.174
+ifconfig-push 192.168.1.174 192.168.0.174
diff --git a/roles/openvpn/server/files/ccd/os-node02.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/os-node02.phx2.fedoraproject.org
deleted file mode 100644
index 0831a99310..0000000000
--- a/roles/openvpn/server/files/ccd/os-node02.phx2.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.174 192.168.0.174
diff --git a/roles/openvpn/server/files/ccd/os-node03.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/os-node03.iad2.fedoraproject.org
index 289e6f7fc6..86a784401e 100644
--- a/roles/openvpn/server/files/ccd/os-node03.iad2.fedoraproject.org
+++ b/roles/openvpn/server/files/ccd/os-node03.iad2.fedoraproject.org
@@ -1,2 +1,2 @@
 # ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.20.181 192.168.0.181
+ifconfig-push 192.168.1.181 192.168.0.181
diff --git a/roles/openvpn/server/files/ccd/os-node03.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/os-node03.phx2.fedoraproject.org
deleted file mode 100644
index 86a784401e..0000000000
--- a/roles/openvpn/server/files/ccd/os-node03.phx2.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.181 192.168.0.181
diff --git a/roles/openvpn/server/files/ccd/os-node04.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/os-node04.iad2.fedoraproject.org
index 65661c0f34..dbbf6f7034 100644
--- a/roles/openvpn/server/files/ccd/os-node04.iad2.fedoraproject.org
+++ b/roles/openvpn/server/files/ccd/os-node04.iad2.fedoraproject.org
@@ -1,2 +1,2 @@
 # ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.20.182 192.168.0.182
+ifconfig-push 192.168.1.182 192.168.0.182
diff --git a/roles/openvpn/server/files/ccd/os-node04.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/os-node04.phx2.fedoraproject.org
deleted file mode 100644
index dbbf6f7034..0000000000
--- a/roles/openvpn/server/files/ccd/os-node04.phx2.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.182 192.168.0.182
diff --git a/roles/openvpn/server/files/ccd/os-node05.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/os-node05.iad2.fedoraproject.org
index ae242ecf23..7c3e4518ae 100644
--- a/roles/openvpn/server/files/ccd/os-node05.iad2.fedoraproject.org
+++ b/roles/openvpn/server/files/ccd/os-node05.iad2.fedoraproject.org
@@ -1,2 +1,2 @@
 # ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.20.183 192.168.0.183
+ifconfig-push 192.168.1.183 192.168.0.183
diff --git a/roles/openvpn/server/files/ccd/os-node05.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/os-node05.phx2.fedoraproject.org
deleted file mode 100644
index 7c3e4518ae..0000000000
--- a/roles/openvpn/server/files/ccd/os-node05.phx2.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.183 192.168.0.183