diff --git a/inventory/host_vars/#mirrorlist-host1plus.fedoraproject.org# b/inventory/host_vars/#mirrorlist-host1plus.fedoraproject.org#
deleted file mode 100644
index 4470d79022..0000000000
--- a/inventory/host_vars/#mirrorlist-host1plus.fedoraproject.org#
+++ /dev/null
@@ -1,10 +0,0 @@
----
-nm: 255.255.255.0
-gw: 5.175.150.1
-dns: 217.69.160.18
-ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7
-ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/
-volgroup: /dev/vg_virthost
-eth0_ip: 5.175.150.49
-vmhost: host1plus01.fedoraproject.org
-datacenter: host1plus
diff --git a/inventory/host_vars/proxy11.fedoraproject.org b/inventory/host_vars/proxy11.fedoraproject.org
index 236b5b79ee..4c412de68c 100644
--- a/inventory/host_vars/proxy11.fedoraproject.org
+++ b/inventory/host_vars/proxy11.fedoraproject.org
@@ -7,14 +7,14 @@ num_cpus: 4
 ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7-ext
 ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/
 
-vmhost: host1plus01.fedoraproject.org
+vmhost: dedicatedsolutions01.fedoraproject.org
 volgroup: /dev/vg_virthost
 
 eth0_ip: 67.219.144.68
 
 # This is consumed by the roles/fedora-web/main role
-sponsor: host1plus
-datacenter: host1plus
+sponsor: dedicatedsolutions
+datacenter: dedicatedsolutions
 postfix_group: vpn
 
 nrpe_procs_warn: 1200
diff --git a/roles/nagios_server/files/nagios/hosts/proxy05-fpo.cfg b/roles/nagios_server/files/nagios/hosts/proxy05-fpo.cfg
new file mode 100644
index 0000000000..8d8a7f02ee
--- /dev/null
+++ b/roles/nagios_server/files/nagios/hosts/proxy05-fpo.cfg
@@ -0,0 +1,7 @@
+define host {
+  host_name                    proxy05-fpo
+  alias                        proxy05-fpo.fedoraproject.org
+  use                          defaulttemplate
+  address                      5.175.150.50
+  parents                      proxy05
+}
diff --git a/roles/nagios_server/files/nagios/hosts/proxy05.cfg b/roles/nagios_server/files/nagios/hosts/proxy05.cfg
new file mode 100644
index 0000000000..0e04bb81bc
--- /dev/null
+++ b/roles/nagios_server/files/nagios/hosts/proxy05.cfg
@@ -0,0 +1,7 @@
+define host {
+  host_name                    proxy05
+  alias                        proxy05.fedoraproject.org
+  use                          defaulttemplate
+  address                      proxy05.fedoraproject.org
+  parents                      host1plus01
+}
diff --git a/roles/nagios_server/files/nagios/hosts/proxy10-fpo.cfg b/roles/nagios_server/files/nagios/hosts/proxy10-fpo.cfg
new file mode 100644
index 0000000000..9cbcba1fb6
--- /dev/null
+++ b/roles/nagios_server/files/nagios/hosts/proxy10-fpo.cfg
@@ -0,0 +1,7 @@
+define host {
+  host_name                    proxy11-fpo
+  alias                        proxy11-fpo.phx2.fedoraproject.org
+  use                          defaulttemplate
+  address                      proxy11.phx2.fedoraproject.org
+  parents                      proxy11
+}
diff --git a/roles/nagios_server/files/nagios/hosts/proxy10.cfg b/roles/nagios_server/files/nagios/hosts/proxy10.cfg
new file mode 100644
index 0000000000..99555ecc57
--- /dev/null
+++ b/roles/nagios_server/files/nagios/hosts/proxy10.cfg
@@ -0,0 +1,7 @@
+define host {
+  host_name                    proxy10
+  alias                        proxy10.phx2.fedoraproject.org
+  use                          defaulttemplate
+  address                      proxy10.phx2.fedoraproject.org
+  parents		       virthost17
+}
diff --git a/roles/nagios_server/files/nagios/hosts/proxy11-fpo.cfg b/roles/nagios_server/files/nagios/hosts/proxy11-fpo.cfg
new file mode 100644
index 0000000000..a55bf16da9
--- /dev/null
+++ b/roles/nagios_server/files/nagios/hosts/proxy11-fpo.cfg
@@ -0,0 +1,7 @@
+define host {
+  host_name                    proxy11-fpo
+  alias                        proxy11-fpo.fedoraproject.org
+  use                          defaulttemplate
+  address                      67.219.144.68
+  parents                      proxy11
+}
diff --git a/roles/nagios_server/files/nagios/hosts/proxy11.cfg b/roles/nagios_server/files/nagios/hosts/proxy11.cfg
new file mode 100644
index 0000000000..9d1b306cb1
--- /dev/null
+++ b/roles/nagios_server/files/nagios/hosts/proxy11.cfg
@@ -0,0 +1,7 @@
+define host {
+  host_name                    proxy11
+  alias                        proxy11.fedoraproject.org
+  use                          defaulttemplate
+  address                      proxy11.fedoraproject.org
+  parents                      dedicatedsolutions01
+}
diff --git a/roles/openvpn/server/files/ccd/proxy11.fedoraproject.org b/roles/openvpn/server/files/ccd/proxy11.fedoraproject.org
new file mode 100644
index 0000000000..bf56c35cb8
--- /dev/null
+++ b/roles/openvpn/server/files/ccd/proxy11.fedoraproject.org
@@ -0,0 +1,2 @@
+# ifconfig-push actualIP PtPIP
+ifconfig-push 192.168.1.37 192.168.0.37