diff --git a/playbooks/ifupdown2.yml b/playbooks/ifupdown2.yml
index 1cdf87b..983b11d 100755
--- a/playbooks/ifupdown2.yml
+++ b/playbooks/ifupdown2.yml
@@ -156,17 +156,15 @@
           addresses:
             - 2a09:6840:203::1:3/64
             - 10.203.1.3/16
-        vpn0:
-          addresses:
-            - 2a09:6840:213::1:1/64
-            - 10.213.1.1/16
+        ups0:
+          ipv6_addrgen: false
         monit0:
           ipv6_addrgen: false
         wifi0:
           ipv6_addrgen: false
         int0:
           ipv6_addrgen: false
-        pub0:
+        sw0:
           ipv6_addrgen: false
         bmc0:
           ipv6_addrgen: false
@@ -174,7 +172,9 @@
           ipv6_addrgen: false
         isp0:
           ipv6_addrgen: false
-        mgmt0:
+        ext0:
+          ipv6_addrgen: false
+        vpn0:
           ipv6_addrgen: false
       infra-2.back.infra.auro.re:
         adm0:
@@ -186,13 +186,15 @@
           addresses:
             - 2a09:6840:203::1:4/64
             - 10.203.1.4/16
+        ups0:
+          ipv6_addrgen: false
         monit0:
           ipv6_addrgen: false
         wifi0:
           ipv6_addrgen: false
         int0:
           ipv6_addrgen: false
-        pub0:
+        sw0:
           ipv6_addrgen: false
         bmc0:
           ipv6_addrgen: false
@@ -200,7 +202,9 @@
           ipv6_addrgen: false
         isp0:
           ipv6_addrgen: false
-        mgmt0:
+        ext0:
+          ipv6_addrgen: false
+        vpn0:
           ipv6_addrgen: false
       isp-1.back.infra.auro.re:
         adm0:
diff --git a/playbooks/keepalived.yml b/playbooks/keepalived.yml
index 68d27fa..464912f 100755
--- a/playbooks/keepalived.yml
+++ b/playbooks/keepalived.yml
@@ -57,6 +57,10 @@
     keepalived__virtual_router_id: 82
     keepalived__interface: back0
     keepalived__virtual_addresses:
+      ups0:
+        - 10.201.0.1/16
+        - 2a09:6840:201::1/64
+        - fe80::1/10
       monit0:
         - 10.204.0.1/16
         - 2a09:6840:204::1/64
@@ -69,7 +73,7 @@
         - 10.206.0.1/16
         - 2a09:6840:206::1/64
         - fe80::1/10
-      pub0:
+      sw0:
         - 10.207.0.1/16
         - 2a09:6840:207::1/64
         - fe80::1/10
@@ -85,10 +89,14 @@
         - 10.210.0.1/16
         - 2a09:6840:210::1/64
         - fe80::1/10
-      mgmt0:
+      ext0:
         - 10.211.0.1/16
         - 2a09:6840:211::1/64
         - fe80::1/10
+      vpn0:
+        - 10.213.0.1/16
+        - 2a09:6840:213::1/64
+        - fe80::1/10
     keepalived__main: "{{ inventory_hostname_short == 'infra-1' }}"
   roles:
     - keepalived
diff --git a/playbooks/systemd_link.yml b/playbooks/systemd_link.yml
index 50fc20e..3da0b96 100755
--- a/playbooks/systemd_link.yml
+++ b/playbooks/systemd_link.yml
@@ -90,6 +90,8 @@
       infra-1.back.infra.auro.re:
         adm0:
           mac: 02:00:00:f0:8a:dd
+        ups0:
+          mac: 02:00:00:fe:6f:0e
         back0:
           mac: 02:00:00:f8:93:22
         monit0:
@@ -99,6 +101,8 @@
         int0:
           mac: 02:00:00:75:40:3e
         pub0:
+          enabled: false
+        sw0:
           mac: 02:00:00:ca:e8:d1
         bmc0:
           mac: 02:00:00:47:d1:b9
@@ -107,12 +111,16 @@
         isp0:
           mac: 02:00:00:6b:53:14
         mgmt0:
+          enabled: false
+        ext0:
           mac: 02:00:00:32:86:60
         vpn0:
           mac: 02:00:00:52:5f:85
       infra-2.back.infra.auro.re:
         adm0:
           mac: 04:00:00:d3:03:53
+        ups0:
+          mac: 04:00:00:6d:97:83
         back0:
           mac: 04:00:00:46:ba:f9
         monit0:
@@ -122,6 +130,8 @@
         int0:
           mac: 04:00:00:21:fd:d0
         pub0:
+          enabled: false
+        sw0:
           mac: 04:00:00:2e:5b:16
         bmc0:
           mac: 04:00:00:bb:5a:a6
@@ -130,7 +140,11 @@
         isp0:
           mac: 04:00:00:f4:4c:5d
         mgmt0:
+          enabled: false
+        ext0:
           mac: 04:00:00:1d:0e:83
+        vpn0:
+          mac: 04:00:00:02:ba:dd
       isp-1.back.infra.auro.re:
         adm0:
           mac: 02:00:00:D8:37:45