diff --git a/inventory/host_vars/noc-cc01.rdu-cc.fedoraproject.org b/inventory/host_vars/noc-cc01.rdu-cc.fedoraproject.org
index 85df3582c6..eef1a31d8f 100644
--- a/inventory/host_vars/noc-cc01.rdu-cc.fedoraproject.org
+++ b/inventory/host_vars/noc-cc01.rdu-cc.fedoraproject.org
@@ -23,7 +23,7 @@ network_connections:
         - "{{ dns1 }}"
         - "{{ dns2 }}"
       dns_search:
-        - rdu-cc.fedoraproject.org
+        - vpn.fedoraproject.org
         - fedoraproject.org
       gateway4: "{{ eth0_ipv4_gw }}"
     mac: "{{ ansible_default_ipv4.macaddress }}"
diff --git a/inventory/host_vars/storinator01.rdu-cc.fedoraproject.org b/inventory/host_vars/storinator01.rdu-cc.fedoraproject.org
index f314fa7bfe..670814005c 100644
--- a/inventory/host_vars/storinator01.rdu-cc.fedoraproject.org
+++ b/inventory/host_vars/storinator01.rdu-cc.fedoraproject.org
@@ -2,7 +2,8 @@
 # this box is not currently mission critical
 datacenter: rdu-cc
 dns1: 8.8.8.8
-dns_search1: fedoraproject.org
+dns_search1: vpn.fedoraproject.org
+dns_search2: fedoraproject.org
 eth0_ipv4: 8.43.85.62
 eth0_ipv4_gw: 8.43.85.254
 eth0_ipv4_nm: 23
@@ -23,6 +24,7 @@ network_connections:
       - '{{ dns1 }}'
       dns_search:
       - '{{ dns_search1 }}'
+      - '{{ dns_search2 }}'
       gateway4: '{{ eth0_ipv4_gw }}'
     mac: '{{ mac0 }}'
     name: eth0
diff --git a/inventory/host_vars/vmhost-x86-cc03.rdu-cc.fedoraproject.org b/inventory/host_vars/vmhost-x86-cc03.rdu-cc.fedoraproject.org
index 44ddaf666d..75cc76a648 100644
--- a/inventory/host_vars/vmhost-x86-cc03.rdu-cc.fedoraproject.org
+++ b/inventory/host_vars/vmhost-x86-cc03.rdu-cc.fedoraproject.org
@@ -10,7 +10,8 @@ br1_port0_mac: '{{ mac2 }}'
 datacenter: rdu-cc
 dns1: 8.8.8.8
 dns2: 8.8.4.4
-dns_search1: fedoraproject.org
+dns_search1: vpn.fedoraproject.org
+dns_search2: fedoraproject.org
 mac0: C8:4B:D6:98:5D:74
 mac2: c8:4b:d6:98:5d:75
 network_connections:
@@ -24,6 +25,7 @@ network_connections:
       - '{{ dns2 }}'
       dns_search:
       - '{{ dns_search1 }}'
+      - '{{ dns_search2 }}'
       gateway4: '{{ br0_ipv4_gw }}'
     name: br0
     state: up
diff --git a/inventory/host_vars/vmhost-x86-cc05.rdu-cc.fedoraproject.org b/inventory/host_vars/vmhost-x86-cc05.rdu-cc.fedoraproject.org
index 5e078d0c76..3777930f23 100644
--- a/inventory/host_vars/vmhost-x86-cc05.rdu-cc.fedoraproject.org
+++ b/inventory/host_vars/vmhost-x86-cc05.rdu-cc.fedoraproject.org
@@ -34,8 +34,8 @@ network_connections:
         - 8.8.4.4
         - 2001:4860:4860::8888
       dns_search:
-        - fedoraproject.org
         - vpn.fedoraproject.org
+        - fedoraproject.org
         - rdu-cc.fedoraproject.org
       gateway4: "{{ br0_ipv4_gw }}"
       gateway6: "{{ br0_ipv6_gw }}"
diff --git a/inventory/host_vars/vmhost-x86-cc06.rdu-cc.fedoraproject.org b/inventory/host_vars/vmhost-x86-cc06.rdu-cc.fedoraproject.org
index eb8de94c12..412668c19c 100644
--- a/inventory/host_vars/vmhost-x86-cc06.rdu-cc.fedoraproject.org
+++ b/inventory/host_vars/vmhost-x86-cc06.rdu-cc.fedoraproject.org
@@ -34,8 +34,8 @@ network_connections:
         - 8.8.4.4
         - 2001:4860:4860::8888
       dns_search:
-        - fedoraproject.org
         - vpn.fedoraproject.org
+        - fedoraproject.org
         - rdu-cc.fedoraproject.org
       gateway4: "{{ br0_ipv4_gw }}"
       gateway6: "{{ br0_ipv6_gw }}"