diff --git a/device-types/ZPE/BSR-T8-BASE.yaml b/device-types/ZPE/BSR-T8-BASE.yaml
new file mode 100644
index 0000000000..2efcc7968e
--- /dev/null
+++ b/device-types/ZPE/BSR-T8-BASE.yaml
@@ -0,0 +1,108 @@
+---
+manufacturer: ZPE
+model: Bold SR 2C
+slug: zpe-bsr-t8-base
+part_number: BSR-T8-BASE
+u_height: 1
+is_full_depth: false
+airflow: passive
+weight: 1.2
+weight_unit: kg
+description: 2-Core Intel CPU, 8x RJ45 Serial rolled, 5x GbE, Single AC Power Supply
+comments: '[ZPE Nodegrid Bold SR Data Sheet](https://go.zpesystems.com/rs/004-BTR-463/images/Datasheet-Nodegrid-Bold-SR.pdf)'
+console-ports:
+  - name: Console
+    label: CONSOLE
+    type: rj-45
+  # 1x VGA
+console-server-ports:
+  - name: ttyS1
+    label: '1'
+    type: rj-45
+  - name: ttyS2
+    label: '2'
+    type: rj-45
+  - name: ttyS3
+    label: '3'
+    type: rj-45
+  - name: ttyS4
+    label: '4'
+    type: rj-45
+  - name: ttyS5
+    label: '5'
+    type: rj-45
+  - name: ttyS6
+    label: '6'
+    type: rj-45
+  - name: ttyS7
+    label: '7'
+    type: rj-45
+  - name: ttyS8
+    label: '8'
+    type: rj-45
+
+  - name: usbS1
+    label: '1'
+    type: usb-a
+    description: USB 2.0
+  - name: usbS2
+    label: '2'
+    type: usb-a
+    description: USB 2.0
+  - name: usbS3
+    label: '3'
+    type: usb-a
+    description: USB 3.0
+  - name: usbS4
+    label: '4'
+    type: usb-a
+    description: USB 3.0
+power-ports:
+  - name: PS
+    label: PWR IN
+    type: dc-terminal
+interfaces:
+  - name: eth0
+    label: ETH 0
+    type: 1000base-t
+
+  - name: backplane0
+    type: 1000base-t
+
+  - name: netS1
+    label: '1'
+    type: 1000base-t
+    bridge: backplane0
+  - name: netS2
+    label: '2'
+    type: 1000base-t
+    bridge: backplane0
+  - name: netS3
+    label: '3'
+    type: 1000base-t
+    bridge: backplane0
+  - name: netS4
+    label: '4'
+    type: 1000base-t
+    bridge: backplane0
+module-bays:
+  - name: Mini PCIe
+    position: '0'
+    description: Wi-Fi
+  - name: SATA DOM 1
+    position: '1'
+    description: Primary Storage, Right (next to Power Switch)
+  - name: SATA DOM 2
+    position: '2'
+    description: Secondary Storage, Center
+
+  - name: Channel-A
+    label: Channel A
+    position: '0'
+    description: Cellular Modem, Sim A1 and A2, M.2 B-Key
+  - name: Channel-B
+    label: Channel B
+    position: '1'
+    description: Cellular Modem, Sim B1 and B2, M.2 B-Key
+
+  # There is one DDR3 SO-DIMM slot named DIMM0
diff --git a/device-types/ZPE/GSR-T8-BASE.yaml b/device-types/ZPE/GSR-T8-BASE.yaml
index f1a20e573a..af6b50fb24 100644
--- a/device-types/ZPE/GSR-T8-BASE.yaml
+++ b/device-types/ZPE/GSR-T8-BASE.yaml
@@ -1,78 +1,161 @@
 ---
 manufacturer: ZPE
-model: GSR-T8-BASE
+model: Gate SR 4C
 slug: zpe-gsr-t8-base
 part_number: GSR-T8-BASE
 u_height: 1
 is_full_depth: false
-comments: ZPE Nodegrid Gate SR. 8X RJ45 Serial, 13X ETH (5 GbE, 4X PoE+, 2 SFP+)
+airflow: passive
+weight: 0.9
+weight_unit: kg
+description: 4-Core Intel CPU, 8x RJ45 Serial rolled, 2x SFP+, 5x GbE, 4x PoE+, Dual DC input (wide range DC)
+comments: '[ZPE Nodegrid Gate SR Data Sheet](https://go.zpesystems.com/rs/004-BTR-463/images/Datasheet-Nodegrid-Gate-SR.pdf)'
 console-ports:
   - name: Console
+    label: CONSOLE
     type: rj-45
+  # 1x HDMI
 console-server-ports:
   - name: ttyS1
+    label: '1'
     type: rj-45
   - name: ttyS2
+    label: '2'
     type: rj-45
   - name: ttyS3
+    label: '3'
     type: rj-45
   - name: ttyS4
+    label: '4'
     type: rj-45
   - name: ttyS5
+    label: '5'
     type: rj-45
   - name: ttyS6
+    label: '6'
     type: rj-45
   - name: ttyS7
+    label: '7'
     type: rj-45
   - name: ttyS8
+    label: '8'
     type: rj-45
+
   - name: usbS0-1
+    label: USB
     type: usb-a
+    description: USB 3.0, Rear Top (below ETH 0)
   - name: usbS0-2
+    label: USB
     type: usb-a
+    description: USB 3.0, Rear Bottom
   - name: usbS0-3
+    label: USB
     type: usb-a
+    description: USB 2.0, Front Top
   - name: usbS0-4
+    label: USB
     type: usb-a
+    description: USB 2.0, Front Bottom (above HDMI)
+
+  - name: DIO0
+    label: DIO 0
+    type: other
+    description: Digital I/O Port
+  - name: DIO1
+    label: DIO 1
+    type: other
+    description: Digital I/O Port
+  - name: OUT0
+    label: OUT 0
+    type: other
+    description: Digital Out Port
+  - name: Relay
+    type: other
+    description: Relay Port, next to OUT 0
 power-ports:
-  - name: PSU1
+  - name: PS1
+    label: V1
     type: dc-terminal
-    allocated_draw: 45
-  - name: PSU2
+  - name: PS2
+    label: V2
     type: dc-terminal
-    allocated_draw: 45
 interfaces:
-  - name: ETH0
+  - name: eth0
+    label: ETH 0
     type: 1000base-t
-  - name: SFP0
+
+  - name: sfp0
+    label: SFP+ 0
     type: 10gbase-x-sfpp
-  - name: SFP1
+  - name: sfp1
+    label: SFP+ 1
     type: 10gbase-x-sfpp
+
+  - name: backplane0
+    type: 2.5gbase-t
+  - name: backplane1
+    type: 2.5gbase-t
+    bridge: backplane0
+
   - name: netS1
+    label: '1'
     type: 1000base-t
     poe_mode: pse
     poe_type: type2-ieee802.3at
+    bridge: backplane0
   - name: netS2
+    label: '2'
     type: 1000base-t
     poe_mode: pse
     poe_type: type2-ieee802.3at
+    bridge: backplane0
   - name: netS3
+    label: '3'
     type: 1000base-t
     poe_mode: pse
     poe_type: type2-ieee802.3at
+    bridge: backplane0
   - name: netS4
+    label: '4'
     type: 1000base-t
     poe_mode: pse
     poe_type: type2-ieee802.3at
+    bridge: backplane0
+
   - name: netS5
+    label: '5'
     type: 1000base-t
+    bridge: backplane0
   - name: netS6
+    label: '6'
     type: 1000base-t
+    bridge: backplane0
   - name: netS7
+    label: '7'
     type: 1000base-t
+    bridge: backplane0
   - name: netS8
+    label: '8'
     type: 1000base-t
-    # TODO 2xGPIO, 1xDigital Out, 1xRelay Port
-    # 1 x optional WiFi module
-    # 2 x LTE modem slots
-    # 1 x HDMI
+    bridge: backplane0
+module-bays:
+  - name: Mini PCIe
+    position: '0'
+    description: Wi-Fi, Front
+  - name: SATA DOM 1
+    position: '1'
+    description: Primary Storage, Center (next to Mini PCIe)
+  - name: SATA DOM 2
+    position: '2'
+    description: Secondary Storage, Rear
+
+  - name: Channel-A
+    position: '0'
+    description: Cellular Modem, Sim A1 and A2, M.2 B-Key, Center (next to SFP)
+  - name: Channel-B
+    position: '1'
+    description: Cellular Modem, Sim B1 and B2, M.2 B-Key, Left
+
+  # There are two stacked DDR4 SO-DIMM slots
+  # DIMM0 is the top one, DIMM1 the bottom one (closer to Mainboard)
diff --git a/device-types/ZPE/NSR-BASE-DAC.yaml b/device-types/ZPE/NSR-BASE-DAC.yaml
index 547840c609..cc1302c0c3 100644
--- a/device-types/ZPE/NSR-BASE-DAC.yaml
+++ b/device-types/ZPE/NSR-BASE-DAC.yaml
@@ -1,53 +1,89 @@
 ---
 manufacturer: ZPE
-model: NSR-BASE-DAC
+model: Net SR 4C DAC
 slug: zpe-nsr-base-dac
 part_number: NSR-BASE-DAC
 u_height: 1
-is_full_depth: true
-comments: ZPE Nodegrid Net Services Router. NSR Chassis, Backplane Switch, 2 SFP+, 2 USB 2.0, 1 USB 3.0, 2 GbE, 1 HDMI, 1 console
-airflow: front-to-rear
+is_full_depth: false
+airflow: side-to-rear
 weight: 4.9
 weight_unit: kg
+description: >-
+  Modular chassis, 4-Core Intel CPU, Backplane Switch, 32GB mSATA, 5 Slots,
+  2x SFP+, 2x GbE, 3x USB, 1x HDMI, 1x Console, Dual AC Power Supply
+comments: '[ZPE Nodegrid Net SR Data Sheet](https://go.zpesystems.com/rs/004-BTR-463/images/Datasheet-Nodegrid-Net-SR.pdf)'
 console-ports:
   - name: Console
+    label: CONSOLE
     type: rj-45
-  - name: HDMI
-    type: other
+  # 1x HDMI
 console-server-ports:
   - name: usbS0-1
+    label: USB
     type: usb-a
+    description: USB 3.0, Front
   - name: usbS0-2
+    label: USB
     type: usb-a
+    description: USB 2.0, Rear Top
   - name: usbS0-3
+    label: USB
     type: usb-a
+    description: USB 2.0, Rear Bottom (above HDMI)
 power-ports:
   - name: PS1
-    type: dc-terminal
-    allocated_draw: 45
+    type: iec-60320-c14
+    description: Rear Left
   - name: PS2
-    type: dc-terminal
-    allocated_draw: 45
+    type: iec-60320-c14
+    description: Rear Center
 interfaces:
-  - name: ETH0
+  - name: eth0
+    label: ETH 0
     type: 1000base-t
-  - name: ETH1
+  - name: eth1
+    label: ETH 1
     type: 1000base-t
-  - name: SFP0
+
+  - name: sfp0
+    label: SFP 0
     type: 10gbase-x-sfpp
-  - name: SFP1
+    bridge: backplane0
+  - name: sfp1
+    label: SFP 1
     type: 10gbase-x-sfpp
+    bridge: backplane0
+
+  - name: backplane0
+    type: 10gbase-kr
+  - name: backplane1
+    type: 10gbase-kr
+    bridge: backplane0
 module-bays:
   - name: slot-1
     position: '1'
+    description: Module Slot, Front Left
   - name: slot-2
     position: '2'
+    description: Module Slot, Front Center
   - name: slot-3
     position: '3'
+    description: Module Slot, Front Right
   - name: slot-4
     position: '4'
+    description: Module Slot, Rear Right
   - name: slot-5
     position: '5'
-    # TODO 2xGPIO, 1xDigital Out, 1xRelay Port
-    # 1 x optional WiFi module
-    # 2 x LTE modem slots
+    description: Module Slot, Rear Center
+
+  - name: system fan 1
+    position: '1'
+    description: Fan Slot, Rear Center
+  - name: system fan 2
+    position: '2'
+    description: Fan Slot, Rear Left (next to Power Supply)
+
+  # There are two stacked DDR4 SO-DIMM slots
+  # DIMM0 is the top one, DIMM1 the bottom one (closer to Mainboard)
+
+  # The integrated storage is in a mSATA slot
diff --git a/device-types/ZPE/NSR-LITE-DAC.yaml b/device-types/ZPE/NSR-LITE-DAC.yaml
new file mode 100644
index 0000000000..dfc172f03b
--- /dev/null
+++ b/device-types/ZPE/NSR-LITE-DAC.yaml
@@ -0,0 +1,84 @@
+---
+manufacturer: ZPE
+model: Net SR Lite
+slug: zpe-nsr-lite-dac
+part_number: NSR-LITE-DAC
+u_height: 1
+is_full_depth: false
+airflow: side-to-rear
+weight: 4.9
+weight_unit: kg
+description: >-
+  Modular chassis, 4-Core Intel CPU, No dedicated Backplane Switch, 32GB mSATA, 5 Slots,
+  2x SFP+, 2x GbE, 3x USB, 1x HDMI, 1x Console, Dual AC Power Supply
+comments: '[ZPE Nodegrid Net SR Data Sheet](https://go.zpesystems.com/rs/004-BTR-463/images/Datasheet-Nodegrid-Net-SR.pdf)'
+console-ports:
+  - name: Console
+    label: CONSOLE
+    type: rj-45
+  # 1x HDMI
+console-server-ports:
+  - name: usbS0-1
+    label: USB
+    type: usb-a
+    description: USB 3.0, Front
+  - name: usbS0-2
+    label: USB
+    type: usb-a
+    description: USB 2.0, Rear Top
+  - name: usbS0-3
+    label: USB
+    type: usb-a
+    description: USB 2.0, Rear Bottom (above HDMI)
+power-ports:
+  - name: PS1
+    type: iec-60320-c14
+    description: Rear Left
+  - name: PS2
+    type: iec-60320-c14
+    description: Rear Center
+interfaces:
+  - name: eth0
+    label: ETH 0
+    type: 1000base-t
+  - name: eth1
+    label: ETH 1
+    type: 1000base-t
+
+  - name: sfp0
+    label: SFP 0
+    type: 10gbase-x-sfpp
+  - name: sfp1
+    label: SFP 1
+    type: 10gbase-x-sfpp
+
+  - name: backplane0
+    type: 10gbase-kr
+module-bays:
+  - name: slot-1
+    position: '1'
+    description: Module Slot, Front Left
+  - name: slot-2
+    position: '2'
+    description: Module Slot, Front Center
+  - name: slot-3
+    position: '3'
+    description: Module Slot, Front Right
+  - name: slot-4
+    position: '4'
+    description: Module Slot, Rear Right
+  - name: slot-5
+    position: '5'
+    description: Module Slot, Rear Center
+
+  - name: system fan 1
+    position: '1'
+    description: Fan Slot, Rear Center
+  - name: system fan 2
+    position: '2'
+    description: Fan Slot, Rear Left (next to Power Supply)
+
+  # There are two stacked DDR4 SO-DIMM slots
+  # DIMM0 is the top one, DIMM1 the bottom one (closer to Mainboard)
+
+  # The integrated storage is in a mSATA slot
diff --git a/device-types/ZPE/NSR-TOP1-DAC.yaml b/device-types/ZPE/NSR-TOP1-DAC.yaml
new file mode 100644
index 0000000000..5cf7db8712
--- /dev/null
+++ b/device-types/ZPE/NSR-TOP1-DAC.yaml
@@ -0,0 +1,89 @@
+---
+manufacturer: ZPE
+model: Net SR 8C DAC
+slug: zpe-nsr-top1-dac
+part_number: NSR-TOP1-DAC
+u_height: 1
+is_full_depth: false
+airflow: side-to-rear
+weight: 4.9
+weight_unit: kg
+description: >-
+  Modular chassis, 8-Core Intel CPU, Backplane Switch, 32GB mSATA, 5 Slots,
+  2x SFP+, 2x GbE, 3x USB, 1x HDMI, 1x Console, Dual AC Power Supply
+comments: '[ZPE Nodegrid Net SR Data Sheet](https://go.zpesystems.com/rs/004-BTR-463/images/Datasheet-Nodegrid-Net-SR.pdf)'
+console-ports:
+  - name: Console
+    label: CONSOLE
+    type: rj-45
+  # 1x HDMI
+console-server-ports:
+  - name: usbS0-1
+    label: USB
+    type: usb-a
+    description: USB 3.0, Front
+  - name: usbS0-2
+    label: USB
+    type: usb-a
+    description: USB 2.0, Rear Top
+  - name: usbS0-3
+    label: USB
+    type: usb-a
+    description: USB 2.0, Rear Bottom (above HDMI)
+power-ports:
+  - name: PS1
+    type: iec-60320-c14
+    description: Rear Left
+  - name: PS2
+    type: iec-60320-c14
+    description: Rear Center
+interfaces:
+  - name: eth0
+    label: ETH 0
+    type: 1000base-t
+  - name: eth1
+    label: ETH 1
+    type: 1000base-t
+
+  - name: sfp0
+    label: SFP 0
+    type: 10gbase-x-sfpp
+    bridge: backplane0
+  - name: sfp1
+    label: SFP 1
+    type: 10gbase-x-sfpp
+    bridge: backplane0
+
+  - name: backplane0
+    type: 10gbase-kr
+  - name: backplane1
+    type: 10gbase-kr
+    bridge: backplane0
+module-bays:
+  - name: slot-1
+    position: '1'
+    description: Module Slot, Front Left
+  - name: slot-2
+    position: '2'
+    description: Module Slot, Front Center
+  - name: slot-3
+    position: '3'
+    description: Module Slot, Front Right
+  - name: slot-4
+    position: '4'
+    description: Module Slot, Rear Right
+  - name: slot-5
+    position: '5'
+    description: Module Slot, Rear Center
+
+  - name: system fan 1
+    position: '1'
+    description: Fan Slot, Rear Center
+  - name: system fan 2
+    position: '2'
+    description: Fan Slot, Rear Left (next to Power Supply)
+
+  # There are two stacked DDR4 SO-DIMM slots
+  # DIMM0 is the top one, DIMM1 the bottom one (closer to Mainboard)
+
+  # The integrated storage is in a mSATA slot
diff --git a/module-types/ZPE/M2-CELL-C.yaml b/module-types/ZPE/M2-CELL-C.yaml
new file mode 100644
index 0000000000..9469e0572a
--- /dev/null
+++ b/module-types/ZPE/M2-CELL-C.yaml
@@ -0,0 +1,8 @@
+---
+manufacturer: ZPE
+model: M2-CELL-C
+part_number: M2-CELL-C
+description: M.2 Cellular 4G/LTE modem with 2 antennas and cables
+interfaces:
+  - name: cdc-wdm{module}
+    type: 4g
diff --git a/module-types/ZPE/M2-CELL5G-C.yaml b/module-types/ZPE/M2-CELL5G-C.yaml
new file mode 100644
index 0000000000..9265ddde76
--- /dev/null
+++ b/module-types/ZPE/M2-CELL5G-C.yaml
@@ -0,0 +1,8 @@
+---
+manufacturer: ZPE
+model: M2-CELL5G-C
+part_number: M2-CELL5G-C
+description: M.2 Cellular 5G modem with 4 antennas and cables
+interfaces:
+  - name: cdc-wdm{module}
+    type: 5g
diff --git a/module-types/ZPE/NSR-16ETH-EXPN.yaml b/module-types/ZPE/NSR-16ETH-EXPN.yaml
index 35cb50bab5..85557c2bce 100644
--- a/module-types/ZPE/NSR-16ETH-EXPN.yaml
+++ b/module-types/ZPE/NSR-16ETH-EXPN.yaml
@@ -1,71 +1,55 @@
 ---
 manufacturer: ZPE
 model: NSR-16ETH-EXPN
-part_number: ZPE-NSR-16ETH-EXPN
-description: NSR 16-Port 1GbE - Ethernet Expansion Card
-comments: '[ZPE Systems Net Services Router Product Sheet](https://www.zpesystems.com/nodegrid/Datasheet/New/NodeGrid%20Services%20Router.pdf)'
+part_number: NSR-16ETH-EXPN
+description: NSR 16-Port 1GbE Ethernet Expansion Card
+comments: '[ZPE Nodegrid Net SR Data Sheet](https://go.zpesystems.com/rs/004-BTR-463/images/Datasheet-Nodegrid-Net-SR.pdf)'
 interfaces:
   - name: netS{module}-1
+    label: '1'
     type: 1000base-t
-    poe_type: type2-ieee802.3at
-    poe_mode: pse
   - name: netS{module}-2
+    label: '2'
     type: 1000base-t
-    poe_type: type2-ieee802.3at
-    poe_mode: pse
   - name: netS{module}-3
+    label: '3'
     type: 1000base-t
-    poe_type: type2-ieee802.3at
-    poe_mode: pse
   - name: netS{module}-4
+    label: '4'
     type: 1000base-t
-    poe_type: type2-ieee802.3at
-    poe_mode: pse
   - name: netS{module}-5
+    label: '5'
     type: 1000base-t
-    poe_type: type2-ieee802.3at
-    poe_mode: pse
   - name: netS{module}-6
+    label: '6'
     type: 1000base-t
-    poe_type: type2-ieee802.3at
-    poe_mode: pse
   - name: netS{module}-7
+    label: '7'
     type: 1000base-t
-    poe_type: type2-ieee802.3at
-    poe_mode: pse
   - name: netS{module}-8
+    label: '8'
     type: 1000base-t
-    poe_type: type2-ieee802.3at
-    poe_mode: pse
   - name: netS{module}-9
+    label: '9'
     type: 1000base-t
-    poe_type: type2-ieee802.3at
-    poe_mode: pse
   - name: netS{module}-10
+    label: '10'
     type: 1000base-t
-    poe_type: type2-ieee802.3at
-    poe_mode: pse
   - name: netS{module}-11
+    label: '11'
     type: 1000base-t
-    poe_type: type2-ieee802.3at
-    poe_mode: pse
   - name: netS{module}-12
+    label: '12'
     type: 1000base-t
-    poe_type: type2-ieee802.3at
-    poe_mode: pse
   - name: netS{module}-13
+    label: '13'
     type: 1000base-t
-    poe_type: type2-ieee802.3at
-    poe_mode: pse
   - name: netS{module}-14
+    label: '14'
     type: 1000base-t
-    poe_type: type2-ieee802.3at
-    poe_mode: pse
   - name: netS{module}-15
+    label: '15'
     type: 1000base-t
-    poe_type: type2-ieee802.3at
-    poe_mode: pse
   - name: netS{module}-16
+    label: '16'
     type: 1000base-t
-    poe_type: type2-ieee802.3at
-    poe_mode: pse
diff --git a/module-types/ZPE/NSR-16S-EXPN.yaml b/module-types/ZPE/NSR-16S-EXPN.yaml
new file mode 100644
index 0000000000..5c45ee86ae
--- /dev/null
+++ b/module-types/ZPE/NSR-16S-EXPN.yaml
@@ -0,0 +1,55 @@
+---
+manufacturer: ZPE
+model: NSR-16S-EXPN
+part_number: NSR-16S-EXPN
+description: NSR 16-Port RJ45 Serial Switchable Expansion Card
+comments: '[ZPE Nodegrid Net SR Data Sheet](https://go.zpesystems.com/rs/004-BTR-463/images/Datasheet-Nodegrid-Net-SR.pdf)'
+console-server-ports:
+  - name: ttyS{module}-1
+    label: '1'
+    type: rj-45
+  - name: ttyS{module}-2
+    label: '2'
+    type: rj-45
+  - name: ttyS{module}-3
+    label: '3'
+    type: rj-45
+  - name: ttyS{module}-4
+    label: '4'
+    type: rj-45
+  - name: ttyS{module}-5
+    label: '5'
+    type: rj-45
+  - name: ttyS{module}-6
+    label: '6'
+    type: rj-45
+  - name: ttyS{module}-7
+    label: '7'
+    type: rj-45
+  - name: ttyS{module}-8
+    label: '8'
+    type: rj-45
+  - name: ttyS{module}-9
+    label: '9'
+    type: rj-45
+  - name: ttyS{module}-10
+    label: '10'
+    type: rj-45
+  - name: ttyS{module}-11
+    label: '11'
+    type: rj-45
+  - name: ttyS{module}-12
+    label: '12'
+    type: rj-45
+  - name: ttyS{module}-13
+    label: '13'
+    type: rj-45
+  - name: ttyS{module}-14
+    label: '14'
+    type: rj-45
+  - name: ttyS{module}-15
+    label: '15'
+    type: rj-45
+  - name: ttyS{module}-16
+    label: '16'
+    type: rj-45
diff --git a/module-types/ZPE/NSR-16SFP-EXPN.yaml b/module-types/ZPE/NSR-16SFP-EXPN.yaml
new file mode 100644
index 0000000000..6fe27ae73a
--- /dev/null
+++ b/module-types/ZPE/NSR-16SFP-EXPN.yaml
@@ -0,0 +1,55 @@
+---
+manufacturer: ZPE
+model: NSR-16SFP-EXPN
+part_number: NSR-16SFP-EXPN
+description: NSR 16-Port 1GbE SFP Expansion Card
+comments: '[ZPE Nodegrid Net SR Data Sheet](https://go.zpesystems.com/rs/004-BTR-463/images/Datasheet-Nodegrid-Net-SR.pdf)'
+interfaces:
+  - name: netS{module}-1
+    label: '1'
+    type: 1000base-x-sfp
+  - name: netS{module}-2
+    label: '2'
+    type: 1000base-x-sfp
+  - name: netS{module}-3
+    label: '3'
+    type: 1000base-x-sfp
+  - name: netS{module}-4
+    label: '4'
+    type: 1000base-x-sfp
+  - name: netS{module}-5
+    label: '5'
+    type: 1000base-x-sfp
+  - name: netS{module}-6
+    label: '6'
+    type: 1000base-x-sfp
+  - name: netS{module}-7
+    label: '7'
+    type: 1000base-x-sfp
+  - name: netS{module}-8
+    label: '8'
+    type: 1000base-x-sfp
+  - name: netS{module}-9
+    label: '9'
+    type: 1000base-x-sfp
+  - name: netS{module}-10
+    label: '10'
+    type: 1000base-x-sfp
+  - name: netS{module}-11
+    label: '11'
+    type: 1000base-x-sfp
+  - name: netS{module}-12
+    label: '12'
+    type: 1000base-x-sfp
+  - name: netS{module}-13
+    label: '13'
+    type: 1000base-x-sfp
+  - name: netS{module}-14
+    label: '14'
+    type: 1000base-x-sfp
+  - name: netS{module}-15
+    label: '15'
+    type: 1000base-x-sfp
+  - name: netS{module}-16
+    label: '16'
+    type: 1000base-x-sfp
diff --git a/module-types/ZPE/NSR-16SRL-EXPN.yaml b/module-types/ZPE/NSR-16SRL-EXPN.yaml
index e101248736..f6c36f4a6f 100644
--- a/module-types/ZPE/NSR-16SRL-EXPN.yaml
+++ b/module-types/ZPE/NSR-16SRL-EXPN.yaml
@@ -1,39 +1,55 @@
 ---
 manufacturer: ZPE
 model: NSR-16SRL-EXPN
-part_number: ZPE-NSR-16SRL-EXPN
+part_number: NSR-16SRL-EXPN
 description: NSR 16-Port RJ45 Serial Rolled Expansion Card
-comments: '[ZPE Systems Net Services Router Product Sheet](https://www.zpesystems.com/nodegrid/Datasheet/New/NodeGrid%20Services%20Router.pdf)'
+comments: '[ZPE Nodegrid Net SR Data Sheet](https://go.zpesystems.com/rs/004-BTR-463/images/Datasheet-Nodegrid-Net-SR.pdf)'
 console-server-ports:
   - name: ttyS{module}-1
+    label: '1'
     type: rj-45
   - name: ttyS{module}-2
+    label: '2'
     type: rj-45
   - name: ttyS{module}-3
+    label: '3'
     type: rj-45
   - name: ttyS{module}-4
+    label: '4'
     type: rj-45
   - name: ttyS{module}-5
+    label: '5'
     type: rj-45
   - name: ttyS{module}-6
+    label: '6'
     type: rj-45
   - name: ttyS{module}-7
+    label: '7'
     type: rj-45
   - name: ttyS{module}-8
+    label: '8'
     type: rj-45
   - name: ttyS{module}-9
+    label: '9'
     type: rj-45
   - name: ttyS{module}-10
+    label: '10'
     type: rj-45
   - name: ttyS{module}-11
+    label: '11'
     type: rj-45
   - name: ttyS{module}-12
+    label: '12'
     type: rj-45
   - name: ttyS{module}-13
+    label: '13'
     type: rj-45
   - name: ttyS{module}-14
+    label: '14'
     type: rj-45
   - name: ttyS{module}-15
+    label: '15'
     type: rj-45
   - name: ttyS{module}-16
+    label: '16'
     type: rj-45
diff --git a/module-types/ZPE/NSR-8ETH-POE-EXPN.yaml b/module-types/ZPE/NSR-8ETH-POE-EXPN.yaml
new file mode 100644
index 0000000000..48b13dba35
--- /dev/null
+++ b/module-types/ZPE/NSR-8ETH-POE-EXPN.yaml
@@ -0,0 +1,47 @@
+---
+manufacturer: ZPE
+model: NSR-8ETH-POE-EXPN
+part_number: NSR-8ETH-POE-EXPN
+description: NSR 8-Port 1GbE PoE+ Ethernet Expansion Card
+comments: '[ZPE Nodegrid Net SR Data Sheet](https://go.zpesystems.com/rs/004-BTR-463/images/Datasheet-Nodegrid-Net-SR.pdf)'
+interfaces:
+  - name: netS{module}-1
+    label: '1'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: netS{module}-2
+    label: '2'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: netS{module}-3
+    label: '3'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: netS{module}-4
+    label: '4'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: netS{module}-5
+    label: '5'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: netS{module}-6
+    label: '6'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: netS{module}-7
+    label: '7'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: netS{module}-8
+    label: '8'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
diff --git a/module-types/ZPE/NSR-8SFP-EXPN.yaml b/module-types/ZPE/NSR-8SFP-EXPN.yaml
index 853ec63069..674dbd773a 100644
--- a/module-types/ZPE/NSR-8SFP-EXPN.yaml
+++ b/module-types/ZPE/NSR-8SFP-EXPN.yaml
@@ -1,23 +1,31 @@
 ---
 manufacturer: ZPE
 model: NSR-8SFP-EXPN
-part_number: ZPE-NSR-8SFP-EXPN
+part_number: NSR-8SFP-EXPN
 description: NSR 8-Port 10GbE SFP Expansion Card
-comments: '[ZPE Systems Net Services Router Product Sheet](https://www.zpesystems.com/nodegrid/Datasheet/New/NodeGrid%20Services%20Router.pdf)'
+comments: '[ZPE Nodegrid Net SR Data Sheet](https://go.zpesystems.com/rs/004-BTR-463/images/Datasheet-Nodegrid-Net-SR.pdf)'
 interfaces:
   - name: netS{module}-1
+    label: '1'
     type: 10gbase-x-sfpp
   - name: netS{module}-2
+    label: '2'
     type: 10gbase-x-sfpp
   - name: netS{module}-3
+    label: '3'
     type: 10gbase-x-sfpp
   - name: netS{module}-4
+    label: '4'
     type: 10gbase-x-sfpp
   - name: netS{module}-5
+    label: '5'
     type: 10gbase-x-sfpp
   - name: netS{module}-6
+    label: '6'
     type: 10gbase-x-sfpp
   - name: netS{module}-7
+    label: '7'
     type: 10gbase-x-sfpp
   - name: netS{module}-8
+    label: '8'
     type: 10gbase-x-sfpp
diff --git a/module-types/ZPE/NSR-DISK-EXPN.yaml b/module-types/ZPE/NSR-DISK-EXPN.yaml
new file mode 100644
index 0000000000..61bcf9a2f3
--- /dev/null
+++ b/module-types/ZPE/NSR-DISK-EXPN.yaml
@@ -0,0 +1,11 @@
+---
+manufacturer: ZPE
+model: NSR-DISK-EXPN
+part_number: NSR-DISK-EXPN
+description: NSR Storage Expansion Card
+comments: '[ZPE Nodegrid Net SR Data Sheet](https://go.zpesystems.com/rs/004-BTR-463/images/Datasheet-Nodegrid-Net-SR.pdf)'
+# TODO instead of module-bay use "Hard disk" profile
+module-bays:
+  - name: Hard disk
+    position: '1'
+    description: 2.5" SATA
diff --git a/module-types/ZPE/NSR-FAN-IN.yaml b/module-types/ZPE/NSR-FAN-IN.yaml
new file mode 100644
index 0000000000..60ac17d9e7
--- /dev/null
+++ b/module-types/ZPE/NSR-FAN-IN.yaml
@@ -0,0 +1,6 @@
+---
+manufacturer: ZPE
+model: NSR-FAN-IN
+part_number: NSR-FAN-IN
+description: NSR Fan, Intake (air in)
+comments: '[ZPE Nodegrid Net SR Data Sheet](https://go.zpesystems.com/rs/004-BTR-463/images/Datasheet-Nodegrid-Net-SR.pdf)'
diff --git a/module-types/ZPE/NSR-FAN-OUT.yaml b/module-types/ZPE/NSR-FAN-OUT.yaml
new file mode 100644
index 0000000000..0924ca51c0
--- /dev/null
+++ b/module-types/ZPE/NSR-FAN-OUT.yaml
@@ -0,0 +1,6 @@
+---
+manufacturer: ZPE
+model: NSR-FAN-OUT
+part_number: NSR-FAN-OUT
+description: NSR Fan, Exhaust (air out)
+comments: '[ZPE Nodegrid Net SR Data Sheet](https://go.zpesystems.com/rs/004-BTR-463/images/Datasheet-Nodegrid-Net-SR.pdf)'
diff --git a/module-types/ZPE/NSR-M2-EXPN.yaml b/module-types/ZPE/NSR-M2-EXPN.yaml
new file mode 100644
index 0000000000..b930858ec7
--- /dev/null
+++ b/module-types/ZPE/NSR-M2-EXPN.yaml
@@ -0,0 +1,15 @@
+---
+manufacturer: ZPE
+model: NSR-M2-EXPN
+part_number: NSR-M2-EXPN
+description: NSR M.2 / SATA Expansion Card
+comments: '[ZPE Nodegrid Net SR Data Sheet](https://go.zpesystems.com/rs/004-BTR-463/images/Datasheet-Nodegrid-Net-SR.pdf)'
+module-bays:
+  - name: S{module}-A
+    label: Channel A
+    position: '0'  # TODO this should be (module*2)-2
+    description: Cellular Modem, Sim A1, M.2 B-Key
+  - name: S{module}-B
+    label: Channel B
+    position: '1'  # TODO this should be (module*2)-1
+    description: Cellular Modem, Sim B1, M.2 B-Key