diff --git a/hosts b/hosts
index 90917a4..4137022 100644
--- a/hosts
+++ b/hosts
@@ -98,6 +98,8 @@ isp-1.rtr.infra.auro.re
 isp-2.rtr.infra.auro.re
 edge-1.rtr.infra.auro.re
 edge-2.rtr.infra.auro.re
+infra-1.rtr.infra.auro.re
+infra-2.rtr.infra.auro.re
 dhcp-1.isp.auro.re
 dhcp-2.isp.auro.re
 radius-fleming-backup.adm.auro.re
diff --git a/playbooks/ifupdown2.yml b/playbooks/ifupdown2.yml
index 49e0d00..716458a 100755
--- a/playbooks/ifupdown2.yml
+++ b/playbooks/ifupdown2.yml
@@ -9,6 +9,8 @@
     - isp-2.rtr.infra.auro.re
     - edge-1.rtr.infra.auro.re
     - edge-2.rtr.infra.auro.re
+    - infra-1.rtr.infra.auro.re
+    - infra-2.rtr.infra.auro.re
   vars:
     # TODO: netbox
     ifupdown2__hosts:
@@ -214,7 +216,7 @@
         ens21: null # zayo
         ens22: # backbone
           addresses:
-            - 2a09:6840:203:1:1::/64
+            - 2a09:6840:203:1:1::1/64
             - 10.203.1.1/16
       edge-2.rtr.infra.auro.re:
         ens18:
@@ -229,8 +231,60 @@
         ens21: null # zayo
         ens22: # backbone
           addresses:
-            - 2a09:6840:203:1:2::/64
+            - 2a09:6840:203:1:2::1/64
             - 10.203.1.2/16
+      infra-1.rtr.infra.auro.re:
+        ens18:
+          gateways:
+            - 2a09:6840:128::254
+            - 10.128.0.254
+          addresses:
+            - 2a09:6840:128::2:76/56
+            - 10.128.2.76/16
+        ens19:
+          addresses:
+            - 2a09:6840:1:3::1/64
+            - 10.203.1.3/16
+        ens20:
+          ipv6_addrgen: false
+        ens21:
+          ipv6_addrgen: false
+        ens22:
+          ipv6_addrgen: false
+        ens23:
+          ipv6_addrgen: false
+        ens1:
+          ipv6_addrgen: false
+        ens2:
+          ipv6_addrgen: false
+        enp1s3:
+          ipv6_addrgen: false
+      infra-2.rtr.infra.auro.re:
+        ens18:
+          gateways:
+            - 2a09:6840:128::254
+            - 10.128.0.254
+          addresses:
+            - 2a09:6840:128::2:27/56
+            - 10.128.2.27/16
+        ens19:
+          addresses:
+            - 2a09:6840:1:4::1/64
+            - 10.203.1.4/16
+        ens20:
+          ipv6_addrgen: false
+        ens21:
+          ipv6_addrgen: false
+        ens22:
+          ipv6_addrgen: false
+        ens23:
+          ipv6_addrgen: false
+        ens1:
+          ipv6_addrgen: false
+        ens2:
+          ipv6_addrgen: false
+        enp1s3:
+          ipv6_addrgen: false
     ifupdown2__interfaces: "{{ ifupdown2__hosts[inventory_hostname] }}"
   roles:
     - ifupdown2
@@ -244,6 +298,8 @@
     - isp-2.rtr.infra.auro.re
     - edge-1.rtr.infra.auro.re
     - edge-2.rtr.infra.auro.re
+    - infra-1.rtr.infra.auro.re
+    - infra-2.rtr.infra.auro.re
   vars:
     resolvconf__nameservers:
       - 2a09:6840:128::127
diff --git a/playbooks/keepalived.yml b/playbooks/keepalived.yml
index 5f90142..044b01b 100755
--- a/playbooks/keepalived.yml
+++ b/playbooks/keepalived.yml
@@ -51,4 +51,42 @@
         - fe80::1/10
   roles:
     - keepalived
+
+- hosts:
+    - infra-1.rtr.infra.auro.re
+    - infra-2.rtr.infra.auro.re
+  vars:
+    keepalived__virtual_router_id: 82
+    keepalived__interface: ens19
+    keepalived__virtual_addresses:
+      ens20:
+        - 10.204.0.1/16
+        - 2a09:6840:204::1/64
+        - fe80::1/10
+      ens21:
+        - 10.205.0.1/16
+        - 2a09:6840:205::1/64
+        - fe80::1/10
+      ens22:
+        - 10.206.0.1/16
+        - 2a09:6840:206::1/64
+        - fe80::1/10
+      ens23:
+        - 10.207.0.1/16
+        - 2a09:6840:207::1/64
+        - fe80::1/10
+      ens1:
+        - 10.208.0.1/16
+        - 2a09:6840:208::1/64
+        - fe80::1/10
+      ens2:
+        - 10.209.0.1/16
+        - 2a09:6840:209::1/64
+        - fe80::1/10
+      enp1s3:
+        - 10.210.0.1/16
+        - 2a09:6840:210::1/64
+        - fe80::1/10
+  roles:
+    - keepalived
 ...