diff --git a/roles/openvpn/server/files/ccd/anitya-backend01.fedoraproject.org b/roles/openvpn/server/files/ccd/anitya-backend01.fedoraproject.org
deleted file mode 100644
index 36143a365d..0000000000
--- a/roles/openvpn/server/files/ccd/anitya-backend01.fedoraproject.org
+++ /dev/null
@@ -1 +0,0 @@
-ifconfig-push 192.168.100.6 192.168.100.6
diff --git a/roles/openvpn/server/files/ccd/anitya-frontend01.fedoraproject.org b/roles/openvpn/server/files/ccd/anitya-frontend01.fedoraproject.org
deleted file mode 100644
index b728f7643e..0000000000
--- a/roles/openvpn/server/files/ccd/anitya-frontend01.fedoraproject.org
+++ /dev/null
@@ -1 +0,0 @@
-ifconfig-push 192.168.100.5 192.168.100.5
diff --git a/roles/openvpn/server/files/ccd/app01.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/app01.phx2.fedoraproject.org
deleted file mode 100644
index 5bc426c20b..0000000000
--- a/roles/openvpn/server/files/ccd/app01.phx2.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.3 192.168.0.3
diff --git a/roles/openvpn/server/files/ccd/app02.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/app02.phx2.fedoraproject.org
deleted file mode 100644
index 31611b6440..0000000000
--- a/roles/openvpn/server/files/ccd/app02.phx2.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.4 192.168.0.4
diff --git a/roles/openvpn/server/files/ccd/app03.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/app03.phx2.fedoraproject.org
deleted file mode 100644
index 27a65542ef..0000000000
--- a/roles/openvpn/server/files/ccd/app03.phx2.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.5 192.168.0.5
diff --git a/roles/openvpn/server/files/ccd/app04.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/app04.phx2.fedoraproject.org
deleted file mode 100644
index 1bfa4957ef..0000000000
--- a/roles/openvpn/server/files/ccd/app04.phx2.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.6 192.168.0.6
diff --git a/roles/openvpn/server/files/ccd/app05.fedoraproject.org b/roles/openvpn/server/files/ccd/app05.fedoraproject.org
deleted file mode 100644
index ab8ce5d412..0000000000
--- a/roles/openvpn/server/files/ccd/app05.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.13 192.168.0.13
diff --git a/roles/openvpn/server/files/ccd/app06.fedoraproject.org b/roles/openvpn/server/files/ccd/app06.fedoraproject.org
deleted file mode 100644
index c643b62992..0000000000
--- a/roles/openvpn/server/files/ccd/app06.fedoraproject.org
+++ /dev/null
@@ -1 +0,0 @@
-ifconfig-push 192.168.1.24 192.168.0.24
diff --git a/roles/openvpn/server/files/ccd/app07.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/app07.phx2.fedoraproject.org
deleted file mode 100644
index 2a9e5282aa..0000000000
--- a/roles/openvpn/server/files/ccd/app07.phx2.fedoraproject.org
+++ /dev/null
@@ -1 +0,0 @@
-ifconfig-push 192.168.1.23 192.168.0.23
diff --git a/roles/openvpn/server/files/ccd/app08.fedoraproject.org b/roles/openvpn/server/files/ccd/app08.fedoraproject.org
deleted file mode 100644
index 61e72c4e51..0000000000
--- a/roles/openvpn/server/files/ccd/app08.fedoraproject.org
+++ /dev/null
@@ -1 +0,0 @@
-ifconfig-push 192.168.1.79 192.168.0.79
diff --git a/roles/openvpn/server/files/ccd/ask01.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/ask01.phx2.fedoraproject.org
deleted file mode 100644
index 5d3024e18b..0000000000
--- a/roles/openvpn/server/files/ccd/ask01.phx2.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.51 192.168.0.51
diff --git a/roles/openvpn/server/files/ccd/ask02.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/ask02.phx2.fedoraproject.org
deleted file mode 100644
index d17c410f50..0000000000
--- a/roles/openvpn/server/files/ccd/ask02.phx2.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.98 192.168.0.98
diff --git a/roles/openvpn/server/files/ccd/asterisk02.fedoraproject.org b/roles/openvpn/server/files/ccd/asterisk02.fedoraproject.org
deleted file mode 100644
index 0074dda18e..0000000000
--- a/roles/openvpn/server/files/ccd/asterisk02.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.36 192.168.0.36
diff --git a/roles/openvpn/server/files/ccd/asterisk1.fedoraproject.org b/roles/openvpn/server/files/ccd/asterisk1.fedoraproject.org
deleted file mode 100644
index 37f9b5058e..0000000000
--- a/roles/openvpn/server/files/ccd/asterisk1.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.34 192.168.0.34
diff --git a/roles/openvpn/server/files/ccd/autocloud-web01.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/autocloud-web01.phx2.fedoraproject.org
deleted file mode 100644
index 7722740814..0000000000
--- a/roles/openvpn/server/files/ccd/autocloud-web01.phx2.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.1 192.168.0.1
diff --git a/roles/openvpn/server/files/ccd/autocloud-web02.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/autocloud-web02.phx2.fedoraproject.org
deleted file mode 100644
index 7202c83983..0000000000
--- a/roles/openvpn/server/files/ccd/autocloud-web02.phx2.fedoraproject.org
+++ /dev/null
@@ -1 +0,0 @@
-ifconfig-push 192.168.1.2 192.168.0.2
diff --git a/roles/openvpn/server/files/ccd/backup02.fedoraproject.org b/roles/openvpn/server/files/ccd/backup02.fedoraproject.org
deleted file mode 100644
index a673313263..0000000000
--- a/roles/openvpn/server/files/ccd/backup02.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.42 192.168.0.42
diff --git a/roles/openvpn/server/files/ccd/bapp02.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/bapp02.phx2.fedoraproject.org
deleted file mode 100644
index dc351722e7..0000000000
--- a/roles/openvpn/server/files/ccd/bapp02.phx2.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.43 192.168.0.43
diff --git a/roles/openvpn/server/files/ccd/beaker01.qa.fedoraproject.org b/roles/openvpn/server/files/ccd/beaker01.qa.fedoraproject.org
deleted file mode 100644
index dbf448b3ed..0000000000
--- a/roles/openvpn/server/files/ccd/beaker01.qa.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.155 192.168.0.155
diff --git a/roles/openvpn/server/files/ccd/bodhi01.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/bodhi01.phx2.fedoraproject.org
deleted file mode 100644
index cb76b29e47..0000000000
--- a/roles/openvpn/server/files/ccd/bodhi01.phx2.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.116 192.168.0.116
diff --git a/roles/openvpn/server/files/ccd/bodhi02.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/bodhi02.phx2.fedoraproject.org
deleted file mode 100644
index 77e77f1437..0000000000
--- a/roles/openvpn/server/files/ccd/bodhi02.phx2.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.117 192.168.0.117
diff --git a/roles/openvpn/server/files/ccd/bodhi03.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/bodhi03.phx2.fedoraproject.org
deleted file mode 100644
index 9ac160e0ff..0000000000
--- a/roles/openvpn/server/files/ccd/bodhi03.phx2.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.145 192.168.0.145
diff --git a/roles/openvpn/server/files/ccd/bodhi04.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/bodhi04.phx2.fedoraproject.org
deleted file mode 100644
index 2dba8cacf8..0000000000
--- a/roles/openvpn/server/files/ccd/bodhi04.phx2.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.146 192.168.0.146
diff --git a/roles/openvpn/server/files/ccd/bodhost01.fedoraproject.org b/roles/openvpn/server/files/ccd/bodhost01.fedoraproject.org
deleted file mode 100644
index c2ccfa0d1b..0000000000
--- a/roles/openvpn/server/files/ccd/bodhost01.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.48 192.168.0.48
diff --git a/roles/openvpn/server/files/ccd/bu1.fedoraproject.org b/roles/openvpn/server/files/ccd/bu1.fedoraproject.org
deleted file mode 100644
index 6272f03111..0000000000
--- a/roles/openvpn/server/files/ccd/bu1.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.26 192.168.0.26
diff --git a/roles/openvpn/server/files/ccd/ci-cc-rdu01.fedoraproject.org b/roles/openvpn/server/files/ccd/ci-cc-rdu01.fedoraproject.org
deleted file mode 100644
index 7ffd2c47de..0000000000
--- a/roles/openvpn/server/files/ccd/ci-cc-rdu01.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.167 192.168.0.167
diff --git a/roles/openvpn/server/files/ccd/collab03.fedoraproject.org b/roles/openvpn/server/files/ccd/collab03.fedoraproject.org
deleted file mode 100644
index b74e1e1ac5..0000000000
--- a/roles/openvpn/server/files/ccd/collab03.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.70 192.168.0.70
diff --git a/roles/openvpn/server/files/ccd/collab04.fedoraproject.org b/roles/openvpn/server/files/ccd/collab04.fedoraproject.org
deleted file mode 100644
index 3a6d45b747..0000000000
--- a/roles/openvpn/server/files/ccd/collab04.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.101 192.168.0.101
diff --git a/roles/openvpn/server/files/ccd/collab1.fedoraproject.org b/roles/openvpn/server/files/ccd/collab1.fedoraproject.org
deleted file mode 100644
index 36bbe50565..0000000000
--- a/roles/openvpn/server/files/ccd/collab1.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.21 192.168.0.21
diff --git a/roles/openvpn/server/files/ccd/collab2.fedoraproject.org b/roles/openvpn/server/files/ccd/collab2.fedoraproject.org
deleted file mode 100644
index bf56c35cb8..0000000000
--- a/roles/openvpn/server/files/ccd/collab2.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.37 192.168.0.37
diff --git a/roles/openvpn/server/files/ccd/community01.dev.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/community01.dev.phx2.fedoraproject.org
deleted file mode 100644
index 1732835910..0000000000
--- a/roles/openvpn/server/files/ccd/community01.dev.phx2.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.78 192.168.0.78
diff --git a/roles/openvpn/server/files/ccd/cstore1.fedoraproject.org b/roles/openvpn/server/files/ccd/cstore1.fedoraproject.org
deleted file mode 100644
index a2dd494820..0000000000
--- a/roles/openvpn/server/files/ccd/cstore1.fedoraproject.org
+++ /dev/null
@@ -1 +0,0 @@
-ifconfig-push 192.168.1.50 192.168.0.50
diff --git a/roles/openvpn/server/files/ccd/cstore2.fedoraproject.org b/roles/openvpn/server/files/ccd/cstore2.fedoraproject.org
deleted file mode 100644
index a06f90432b..0000000000
--- a/roles/openvpn/server/files/ccd/cstore2.fedoraproject.org
+++ /dev/null
@@ -1 +0,0 @@
-ifconfig-push 192.168.1.51 192.168.0.51
diff --git a/roles/openvpn/server/files/ccd/darkserver02.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/darkserver02.phx2.fedoraproject.org
deleted file mode 100644
index 2692fedd2b..0000000000
--- a/roles/openvpn/server/files/ccd/darkserver02.phx2.fedoraproject.org
+++ /dev/null
@@ -1 +0,0 @@
-ifconfig-push 192.168.1.150 192.168.0.150
diff --git a/roles/openvpn/server/files/ccd/db1-temp.fedora.phx2.redhat.com b/roles/openvpn/server/files/ccd/db1-temp.fedora.phx2.redhat.com
deleted file mode 100644
index c55754ffb3..0000000000
--- a/roles/openvpn/server/files/ccd/db1-temp.fedora.phx2.redhat.com
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.71 192.168.0.71
diff --git a/roles/openvpn/server/files/ccd/db2-temp.fedora.phx2.redhat.com b/roles/openvpn/server/files/ccd/db2-temp.fedora.phx2.redhat.com
deleted file mode 100644
index ffa72849c1..0000000000
--- a/roles/openvpn/server/files/ccd/db2-temp.fedora.phx2.redhat.com
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.72 192.168.0.72
diff --git a/roles/openvpn/server/files/ccd/fakefas01.fedoraproject.org b/roles/openvpn/server/files/ccd/fakefas01.fedoraproject.org
deleted file mode 100644
index 172096ed8e..0000000000
--- a/roles/openvpn/server/files/ccd/fakefas01.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.100.5 192.168.0.5
diff --git a/roles/openvpn/server/files/ccd/fas02.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/fas02.phx2.fedoraproject.org
deleted file mode 100644
index db5387374f..0000000000
--- a/roles/openvpn/server/files/ccd/fas02.phx2.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.39 192.168.0.39
diff --git a/roles/openvpn/server/files/ccd/fas03.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/fas03.phx2.fedoraproject.org
deleted file mode 100644
index 1b8553137c..0000000000
--- a/roles/openvpn/server/files/ccd/fas03.phx2.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.49 192.168.0.49
diff --git a/roles/openvpn/server/files/ccd/hosted03.fedoraproject.org b/roles/openvpn/server/files/ccd/hosted03.fedoraproject.org
deleted file mode 100644
index 03ced3412c..0000000000
--- a/roles/openvpn/server/files/ccd/hosted03.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.16 192.168.0.16
diff --git a/roles/openvpn/server/files/ccd/hosted04.fedoraproject.org b/roles/openvpn/server/files/ccd/hosted04.fedoraproject.org
deleted file mode 100644
index b4758f7ff1..0000000000
--- a/roles/openvpn/server/files/ccd/hosted04.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.102 192.168.0.102
diff --git a/roles/openvpn/server/files/ccd/hosted1.fedoraproject.org b/roles/openvpn/server/files/ccd/hosted1.fedoraproject.org
deleted file mode 100644
index 55c0293dc8..0000000000
--- a/roles/openvpn/server/files/ccd/hosted1.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.17 192.168.0.17
diff --git a/roles/openvpn/server/files/ccd/infinote.fedoraproject.org b/roles/openvpn/server/files/ccd/infinote.fedoraproject.org
deleted file mode 100644
index fd25583750..0000000000
--- a/roles/openvpn/server/files/ccd/infinote.fedoraproject.org
+++ /dev/null
@@ -1 +0,0 @@
-ifconfig-push 192.168.100.10 192.168.100.10
diff --git a/roles/openvpn/server/files/ccd/insight01.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/insight01.phx2.fedoraproject.org
deleted file mode 100644
index f357b074e5..0000000000
--- a/roles/openvpn/server/files/ccd/insight01.phx2.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.77 192.168.0.77
diff --git a/roles/openvpn/server/files/ccd/kerberos1.fedoraproject.org b/roles/openvpn/server/files/ccd/kerberos1.fedoraproject.org
deleted file mode 100644
index b363dae354..0000000000
--- a/roles/openvpn/server/files/ccd/kerberos1.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.74 192.168.0.74
diff --git a/roles/openvpn/server/files/ccd/keys01.fedoraproject.org b/roles/openvpn/server/files/ccd/keys01.fedoraproject.org
deleted file mode 100644
index 4714ee5c32..0000000000
--- a/roles/openvpn/server/files/ccd/keys01.fedoraproject.org
+++ /dev/null
@@ -1 +0,0 @@
-ifconfig-push 192.168.1.60 192.168.0.60
diff --git a/roles/openvpn/server/files/ccd/keys02.fedoraproject.org b/roles/openvpn/server/files/ccd/keys02.fedoraproject.org
deleted file mode 100644
index db772947ab..0000000000
--- a/roles/openvpn/server/files/ccd/keys02.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.8 192.168.0.8
diff --git a/roles/openvpn/server/files/ccd/log02.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/log02.phx2.fedoraproject.org
deleted file mode 100644
index 25493fe674..0000000000
--- a/roles/openvpn/server/files/ccd/log02.phx2.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.56 192.168.0.56
diff --git a/roles/openvpn/server/files/ccd/memcached01.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/memcached01.phx2.fedoraproject.org
deleted file mode 100644
index 06c21b67c4..0000000000
--- a/roles/openvpn/server/files/ccd/memcached01.phx2.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.46 192.168.0.46
diff --git a/roles/openvpn/server/files/ccd/memcached03.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/memcached03.phx2.fedoraproject.org
deleted file mode 100644
index 462207352f..0000000000
--- a/roles/openvpn/server/files/ccd/memcached03.phx2.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.54 192.168.0.54
diff --git a/roles/openvpn/server/files/ccd/memcached04.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/memcached04.phx2.fedoraproject.org
deleted file mode 100644
index 36059a914f..0000000000
--- a/roles/openvpn/server/files/ccd/memcached04.phx2.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.59 192.168.0.59
diff --git a/roles/openvpn/server/files/ccd/mirrorlist-dedicatedsolutions.fedoraproject.org b/roles/openvpn/server/files/ccd/mirrorlist-dedicatedsolutions.fedoraproject.org
deleted file mode 100644
index aa6b846fb8..0000000000
--- a/roles/openvpn/server/files/ccd/mirrorlist-dedicatedsolutions.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-ifconfig-push 192.168.1.140 192.168.0.140
-
diff --git a/roles/openvpn/server/files/ccd/mirrorlist-host1plus.fedoraproject.org b/roles/openvpn/server/files/ccd/mirrorlist-host1plus.fedoraproject.org
deleted file mode 100644
index 596c08d1e3..0000000000
--- a/roles/openvpn/server/files/ccd/mirrorlist-host1plus.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-ifconfig-push 192.168.1.148 192.168.0.148
-
diff --git a/roles/openvpn/server/files/ccd/mirrorlist-ibiblio02.fedoraproject.org b/roles/openvpn/server/files/ccd/mirrorlist-ibiblio02.fedoraproject.org
deleted file mode 100644
index 9643aff6a5..0000000000
--- a/roles/openvpn/server/files/ccd/mirrorlist-ibiblio02.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-ifconfig-push 192.168.1.152 192.168.0.152
-
diff --git a/roles/openvpn/server/files/ccd/mirrorlist-osuosl.fedoraproject.org b/roles/openvpn/server/files/ccd/mirrorlist-osuosl.fedoraproject.org
deleted file mode 100644
index 0f1fb75fe4..0000000000
--- a/roles/openvpn/server/files/ccd/mirrorlist-osuosl.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-ifconfig-push 192.168.1.106 192.168.0.106
-
diff --git a/roles/openvpn/server/files/ccd/mirrorlist-phx2.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/mirrorlist-phx2.phx2.fedoraproject.org
deleted file mode 100644
index dffef3d851..0000000000
--- a/roles/openvpn/server/files/ccd/mirrorlist-phx2.phx2.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-ifconfig-push 192.168.1.108 192.168.0.108
-
diff --git a/roles/openvpn/server/files/ccd/mirrorlist-serverbeach.fedoraproject.org b/roles/openvpn/server/files/ccd/mirrorlist-serverbeach.fedoraproject.org
deleted file mode 100644
index 7a7e97a9ad..0000000000
--- a/roles/openvpn/server/files/ccd/mirrorlist-serverbeach.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-ifconfig-push 192.168.1.126 192.168.0.126
-
diff --git a/roles/openvpn/server/files/ccd/modernpaste01.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/modernpaste01.phx2.fedoraproject.org
deleted file mode 100644
index da7155086b..0000000000
--- a/roles/openvpn/server/files/ccd/modernpaste01.phx2.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.94 192.168.0.94
diff --git a/roles/openvpn/server/files/ccd/modernpaste02.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/modernpaste02.phx2.fedoraproject.org
deleted file mode 100644
index cf2fe7c1f4..0000000000
--- a/roles/openvpn/server/files/ccd/modernpaste02.phx2.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.165 192.168.0.165
diff --git a/roles/openvpn/server/files/ccd/nagios01.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/nagios01.phx2.fedoraproject.org
deleted file mode 100644
index 07ac85e2ae..0000000000
--- a/roles/openvpn/server/files/ccd/nagios01.phx2.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.166 192.168.0.166
diff --git a/roles/openvpn/server/files/ccd/ns-sb01.fedoraproject.org b/roles/openvpn/server/files/ccd/ns-sb01.fedoraproject.org
deleted file mode 100644
index f8bff342a8..0000000000
--- a/roles/openvpn/server/files/ccd/ns-sb01.fedoraproject.org
+++ /dev/null
@@ -1 +0,0 @@
-ifconfig-push 192.168.1.46 192.168.0.46
diff --git a/roles/openvpn/server/files/ccd/ns1.fedoraproject.org b/roles/openvpn/server/files/ccd/ns1.fedoraproject.org
deleted file mode 100644
index 3a6c835285..0000000000
--- a/roles/openvpn/server/files/ccd/ns1.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.44 192.168.0.44
diff --git a/roles/openvpn/server/files/ccd/paste01.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/paste01.phx2.fedoraproject.org
deleted file mode 100644
index 8d521f51cd..0000000000
--- a/roles/openvpn/server/files/ccd/paste01.phx2.fedoraproject.org
+++ /dev/null
@@ -1 +0,0 @@
-ifconfig-push 192.168.1.75 192.168.0.75
diff --git a/roles/openvpn/server/files/ccd/paste02.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/paste02.phx2.fedoraproject.org
deleted file mode 100644
index 8f4da48204..0000000000
--- a/roles/openvpn/server/files/ccd/paste02.phx2.fedoraproject.org
+++ /dev/null
@@ -1 +0,0 @@
-ifconfig-push 192.168.1.103 192.168.0.103
diff --git a/roles/openvpn/server/files/ccd/pkgdb01.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/pkgdb01.phx2.fedoraproject.org
deleted file mode 100644
index 14d8a70ffd..0000000000
--- a/roles/openvpn/server/files/ccd/pkgdb01.phx2.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.122 192.168.0.122
diff --git a/roles/openvpn/server/files/ccd/pkgdb02.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/pkgdb02.phx2.fedoraproject.org
deleted file mode 100644
index fcbcad753f..0000000000
--- a/roles/openvpn/server/files/ccd/pkgdb02.phx2.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.123 192.168.0.123
diff --git a/roles/openvpn/server/files/ccd/serverbeach06.fedoraproject.org b/roles/openvpn/server/files/ccd/serverbeach06.fedoraproject.org
deleted file mode 100644
index 6272f03111..0000000000
--- a/roles/openvpn/server/files/ccd/serverbeach06.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.26 192.168.0.26
diff --git a/roles/openvpn/server/files/ccd/serverbeach07.fedoraproject.org b/roles/openvpn/server/files/ccd/serverbeach07.fedoraproject.org
deleted file mode 100644
index 86cdbeb162..0000000000
--- a/roles/openvpn/server/files/ccd/serverbeach07.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.33 192.168.0.33
diff --git a/roles/openvpn/server/files/ccd/serverbeach08.fedoraproject.org b/roles/openvpn/server/files/ccd/serverbeach08.fedoraproject.org
deleted file mode 100644
index 37f9b5058e..0000000000
--- a/roles/openvpn/server/files/ccd/serverbeach08.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.34 192.168.0.34
diff --git a/roles/openvpn/server/files/ccd/serverbeach09.fedoraproject.org b/roles/openvpn/server/files/ccd/serverbeach09.fedoraproject.org
deleted file mode 100644
index c9b065ba01..0000000000
--- a/roles/openvpn/server/files/ccd/serverbeach09.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.35 192.168.0.35
diff --git a/roles/openvpn/server/files/ccd/serverbeach1.fedoraproject.org b/roles/openvpn/server/files/ccd/serverbeach1.fedoraproject.org
deleted file mode 100644
index ef189c7221..0000000000
--- a/roles/openvpn/server/files/ccd/serverbeach1.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.27 192.168.0.27
diff --git a/roles/openvpn/server/files/ccd/serverbeach10.fedoraproject.org b/roles/openvpn/server/files/ccd/serverbeach10.fedoraproject.org
deleted file mode 100644
index 0074dda18e..0000000000
--- a/roles/openvpn/server/files/ccd/serverbeach10.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.36 192.168.0.36
diff --git a/roles/openvpn/server/files/ccd/serverbeach2.fedoraproject.org b/roles/openvpn/server/files/ccd/serverbeach2.fedoraproject.org
deleted file mode 100644
index 4f7ffc01fd..0000000000
--- a/roles/openvpn/server/files/ccd/serverbeach2.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.28 192.168.0.28
diff --git a/roles/openvpn/server/files/ccd/serverbeach3.fedoraproject.org b/roles/openvpn/server/files/ccd/serverbeach3.fedoraproject.org
deleted file mode 100644
index 034cf9e980..0000000000
--- a/roles/openvpn/server/files/ccd/serverbeach3.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.29 192.168.0.29
diff --git a/roles/openvpn/server/files/ccd/serverbeach4.fedoraproject.org b/roles/openvpn/server/files/ccd/serverbeach4.fedoraproject.org
deleted file mode 100644
index 9644fb4394..0000000000
--- a/roles/openvpn/server/files/ccd/serverbeach4.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.30 192.168.0.30
diff --git a/roles/openvpn/server/files/ccd/serverbeach5.fedoraproject.org b/roles/openvpn/server/files/ccd/serverbeach5.fedoraproject.org
deleted file mode 100644
index b06af246c6..0000000000
--- a/roles/openvpn/server/files/ccd/serverbeach5.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.31 192.168.0.31
diff --git a/roles/openvpn/server/files/ccd/tummy01.fedoraproject.org b/roles/openvpn/server/files/ccd/tummy01.fedoraproject.org
deleted file mode 100644
index 21a270324d..0000000000
--- a/roles/openvpn/server/files/ccd/tummy01.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.9 192.168.0.9
diff --git a/roles/openvpn/server/files/ccd/value03.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/value03.phx2.fedoraproject.org
deleted file mode 100644
index cb26bc5ed7..0000000000
--- a/roles/openvpn/server/files/ccd/value03.phx2.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.68 192.168.0.68