diff --git a/inventory/host_vars/download-cc-rdu01.fedoraproject.org b/inventory/host_vars/download-cc-rdu01.fedoraproject.org
index 055aa59ddd..d08ce3d91d 100644
--- a/inventory/host_vars/download-cc-rdu01.fedoraproject.org
+++ b/inventory/host_vars/download-cc-rdu01.fedoraproject.org
@@ -28,7 +28,7 @@ network_connections:
         - "{{ dns_search1 }}"
         - "{{ dns_search2 }}"
       gateway4: "{{ eth0_ipv4_gw }}"
-      gateway6: "{{ eth0_ipv4_gw }}"
+      gateway6: "{{ eth0_ipv6_gw }}"
     mac: "{{ mac_address }}"
     name: eth0
     type: ethernet
diff --git a/inventory/host_vars/download-rdu01.fedoraproject.org b/inventory/host_vars/download-rdu01.fedoraproject.org
index bb923835ff..8f6043f2cd 100644
--- a/inventory/host_vars/download-rdu01.fedoraproject.org
+++ b/inventory/host_vars/download-rdu01.fedoraproject.org
@@ -10,7 +10,7 @@ eth1_ipv4: 172.31.1.1
 eth1_ipv4_gw: 172.31.1.254
 eth1_ipv4_nm: 24
 has_ipv4: yes
-mac0: e4:1f:13:6a:e3:a0
+eth0_mac0: e4:1f:13:6a:e3:a0
 nagios_Check_Services:
   mail: false
   nrpe: false
diff --git a/inventory/host_vars/pagure-stg01.fedoraproject.org b/inventory/host_vars/pagure-stg01.fedoraproject.org
index 08c8af5ad4..bbd0fe9f8b 100644
--- a/inventory/host_vars/pagure-stg01.fedoraproject.org
+++ b/inventory/host_vars/pagure-stg01.fedoraproject.org
@@ -30,7 +30,7 @@ network_connections:
         - "{{ dns_search2 }}"
         - "{{ dns_search3 }}"
       gateway4: "{{ eth0_ipv4_gw }}"
-      gateway6: "{{ eth0_ipv4_gw }}"
+      gateway6: "{{ eth0_ipv6_gw }}"
     mac: "{{ ansible_default_ipv4.macaddress }}"
     name: eth0
     type: ethernet
diff --git a/inventory/host_vars/pagure02.fedoraproject.org b/inventory/host_vars/pagure02.fedoraproject.org
index bd0230e9d5..adbe17d488 100644
--- a/inventory/host_vars/pagure02.fedoraproject.org
+++ b/inventory/host_vars/pagure02.fedoraproject.org
@@ -28,7 +28,7 @@ network_connections:
         - "{{ dns_search1 }}"
         - "{{ dns_search2 }}"
       gateway4: "{{ eth0_ipv4_gw }}"
-      gateway6: "{{ eth0_ipv4_gw }}"
+      gateway6: "{{ eth0_ipv6_gw }}"
     mac: "{{ ansible_default_ipv4.macaddress }}"
     name: eth0
     type: ethernet