diff --git a/hieradata/cluster/andes.yaml b/hieradata/cluster/andes.yaml
index 30626a606d..6d374842e6 100644
--- a/hieradata/cluster/andes.yaml
+++ b/hieradata/cluster/andes.yaml
@@ -5,33 +5,18 @@ network::interfaces_hash:
   em1:  # fqdn
     bootproto: "dhcp"
     defroute: "yes"
+    nozeroconf: "yes"
     onboot: "yes"
     type: "Ethernet"
   em2:  # not connected
     bootproto: "none"
     onboot: "no"
     type: "Ethernet"
-  p2p1:
+  p2p1:  # trunk
     bootproto: "none"
-    master: "bond0"
-    slave: "yes"
-    nm_controlled: "no"
-  p2p1.1300:
-    ensure: "absent"
-  p2p1.1301:
-    ensure: "absent"
-  p2p2:
-    bootproto: "none"
-    master: "bond0"
-    slave: "yes"
-    nm_controlled: "no"
-  bond0:
-    type: "Bond"
-    bootproto: "none"
-    bonding_opts: "mode=4 miimon=100"
-    bonding_master: "yes"
-    nm_controlled: "no"
-  bond0.1201:  # 139.229.166.0/24
+    onboot: "yes"
+    type: "Ethernet"
+  p2p1.1201:  # 139.229.166.0/24
     bootproto: "none"
     defroute: "no"
     netmask: "255.255.255.0"
@@ -39,7 +24,7 @@ network::interfaces_hash:
     onboot: "yes"
     type: "none"
     vlan: "yes"
-  bond0.1400:  # 139.229.170.0/24
+  p2p1.1400:  # 139.229.170.0/24
     bootproto: "none"
     defroute: "no"
     netmask: "255.255.255.0"
@@ -47,12 +32,24 @@ network::interfaces_hash:
     onboot: "yes"
     type: "none"
     vlan: "yes"
+  p2p1.1300:
+    ensure: "absent"
+  p2p1.1301:
+    ensure: "absent"
+  p2p2:  # not connected; was bond0
+    bootproto: "none"
+    onboot: "no"
+    type: "Ethernet"
+  bond0:
+    ensure: "absent"
   bond0.1300:
     ensure: "absent"
   bond0.1301:
     ensure: "absent"
-network::mroutes_hash:
   bond0.1400:
+    ensure: "absent"
+network::mroutes_hash:
+  p2p1.1400:
     routes:
       "139.229.147.0/24": "139.229.170.254"
       #"139.229.166.0/24": "139.229.170.254"
@@ -68,6 +65,9 @@ network::mroutes_hash:
   bond0.1301:
     ensure: "absent"
     routes: {}
+  bond0.1400:
+    ensure: "absent"
+    routes: {}
 yum::managed_repos:
   - "dell"
 yum::repos:
diff --git a/hieradata/node/andes01.cp.lsst.org.yaml b/hieradata/node/andes01.cp.lsst.org.yaml
index 7281c26d63..2925e20c1f 100644
--- a/hieradata/node/andes01.cp.lsst.org.yaml
+++ b/hieradata/node/andes01.cp.lsst.org.yaml
@@ -1,6 +1,6 @@
 ---
 network::interfaces_hash:
-  bond0.1201:
+  p2p1.1201:
     ipaddress: "139.229.166.4"
-  bond0.1400:
+  p2p1.1400:
     ipaddress: "139.229.170.11"
diff --git a/hieradata/node/andes02.cp.lsst.org.yaml b/hieradata/node/andes02.cp.lsst.org.yaml
index 461a8d4bda..90ace151ab 100644
--- a/hieradata/node/andes02.cp.lsst.org.yaml
+++ b/hieradata/node/andes02.cp.lsst.org.yaml
@@ -1,6 +1,6 @@
 ---
 network::interfaces_hash:
-  bond0.1201:
+  p2p1.1201:
     ipaddress: "139.229.166.5"
-  bond0.1400:
+  p2p1.1400:
     ipaddress: "139.229.170.12"
diff --git a/hieradata/node/andes03.cp.lsst.org.yaml b/hieradata/node/andes03.cp.lsst.org.yaml
index 720b6e2abb..c66a782395 100644
--- a/hieradata/node/andes03.cp.lsst.org.yaml
+++ b/hieradata/node/andes03.cp.lsst.org.yaml
@@ -1,6 +1,6 @@
 ---
 network::interfaces_hash:
-  bond0.1201:
+  p2p1.1201:
     ipaddress: "139.229.166.6"
-  bond0.1400:
+  p2p1.1400:
     ipaddress: "139.229.170.13"
diff --git a/hieradata/node/andes04.cp.lsst.org.yaml b/hieradata/node/andes04.cp.lsst.org.yaml
index dfd64b15fb..b645d14525 100644
--- a/hieradata/node/andes04.cp.lsst.org.yaml
+++ b/hieradata/node/andes04.cp.lsst.org.yaml
@@ -1,19 +1,31 @@
 ---
 network::interfaces_hash:
-  bond0.1201:
-    ipaddress: "139.229.166.7"
-  bond0.1400:
-    ipaddress: "139.229.170.14"
-  enp59s0f0:
+  enp59s0f0:  # trunk
+    bootproto: "none"
+    onboot: "yes"
+    type: "Ethernet"
+  enp59s0f1:  # not connected; was bond0
     bootproto: "none"
-    master: "bond0"
-    slave: "yes"
-    nm_controlled: "no"
-  enp59s0f1:
+    onboot: "no"
+    type: "Ethernet"
+  enp59s0f0.1201:  # 139.229.166.0/24
     bootproto: "none"
-    master: "bond0"
-    slave: "yes"
-    nm_controlled: "no"
+    defroute: "no"
+    ipaddress: "139.229.166.7"
+    netmask: "255.255.255.0"
+    nozeroconf: "yes"
+    onboot: "yes"
+    type: "none"
+    vlan: "yes"
+  enp59s0f0.1400:  # 139.229.170.0/24
+    bootproto: "none"
+    defroute: "no"
+    ipaddress: "139.229.170.14"
+    netmask: "255.255.255.0"
+    nozeroconf: "yes"
+    onboot: "yes"
+    type: "none"
+    vlan: "yes"
   p2p1:
     ensure: "absent"
   p2p2:
diff --git a/hieradata/node/andes05.cp.lsst.org.yaml b/hieradata/node/andes05.cp.lsst.org.yaml
index 3064a3d92f..c139a6e293 100644
--- a/hieradata/node/andes05.cp.lsst.org.yaml
+++ b/hieradata/node/andes05.cp.lsst.org.yaml
@@ -1,6 +1,6 @@
 ---
 network::interfaces_hash:
-  bond0.1201:
+  p2p1.1201:
     ipaddress: "139.229.166.8"
-  bond0.1400:
+  p2p1.1400:
     ipaddress: "139.229.170.15"
diff --git a/hieradata/node/andes06.cp.lsst.org.yaml b/hieradata/node/andes06.cp.lsst.org.yaml
index bf46d45ddd..a8116bb419 100644
--- a/hieradata/node/andes06.cp.lsst.org.yaml
+++ b/hieradata/node/andes06.cp.lsst.org.yaml
@@ -1,6 +1,6 @@
 ---
 network::interfaces_hash:
-  bond0.1201:
+  p2p1.1201:
     ipaddress: "139.229.166.9"
-  bond0.1400:
+  p2p1.1400:
     ipaddress: "139.229.170.16"