diff --git a/device-types/Ubiquiti/USW-Pro-Max-16-PoE.yaml b/device-types/Ubiquiti/USW-Pro-Max-16-PoE.yaml
new file mode 100644
index 000000000..918bb8c84
--- /dev/null
+++ b/device-types/Ubiquiti/USW-Pro-Max-16-PoE.yaml
@@ -0,0 +1,85 @@
+---
+manufacturer: Ubiquiti
+model: UniFi Pro Max 16 PoE
+slug: ubiquiti-unifi-pro-max-16-poe
+part_number: USW-Pro-Max-16-PoE
+comments: |
+  UniFi Pro Max 16 (PoE 180W), 4x 2.5GbE RJ45 (ieee802.3bt), 12 GbE RJ45 (ieee802.3at), 2x 10G SFP+, RGB Port Illumination
+  Dimensions: 325.1 x 160 x 43.7 mm (12.8 x 6.3 x 1.7")
+u_height: 1
+weight: 2.1
+weight_unit: kg
+is_full_depth: false
+interfaces:
+  - name: GbE 1
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: GbE 2
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: GbE 3
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: GbE 4
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: GbE 5
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: GbE 6
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: GbE 7
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: GbE 8
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: GbE 9
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: GbE 10
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: GbE 11
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: GbE 12
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: 2.5 GbE 13
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: 2.5 GbE 14
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: 2.5 GbE 15
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: 2.5 GbE 16
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: SFP+ 1
+    type: 10gbase-x-sfpp
+  - name: SFP+ 2
+    type: 10gbase-x-sfpp
+power-ports:
+  - name: Input
+    type: nema-5-15p
+    maxium_draw: 210
diff --git a/device-types/Ubiquiti/USW-Pro-Max-16.yaml b/device-types/Ubiquiti/USW-Pro-Max-16.yaml
new file mode 100644
index 000000000..8c7feff1e
--- /dev/null
+++ b/device-types/Ubiquiti/USW-Pro-Max-16.yaml
@@ -0,0 +1,53 @@
+---
+manufacturer: Ubiquiti
+model: UniFi Pro Max 16
+slug: ubiquiti-unifi-pro-max-16
+part_number: USW-Pro-Max-16
+comments: |
+  UniFi Pro Max 16 (Non-PoE), 4x 2.5GbE RJ45, 12 GbE RJ45, 2x 10G SFP+, RGB Port Illumination
+  Dimensions: 325.1 x 160 x 43.7 mm (12.8 x 6.3 x 1.7")
+u_height: 1
+weight: 1.95
+weight_unit: kg
+is_full_depth: false
+interfaces:
+  - name: GbE 1
+    type: 1000base-t
+  - name: GbE 2
+    type: 1000base-t
+  - name: GbE 3
+    type: 1000base-t
+  - name: GbE 4
+    type: 1000base-t
+  - name: GbE 5
+    type: 1000base-t
+  - name: GbE 6
+    type: 1000base-t
+  - name: GbE 7
+    type: 1000base-t
+  - name: GbE 8
+    type: 1000base-t
+  - name: GbE 9
+    type: 1000base-t
+  - name: GbE 10
+    type: 1000base-t
+  - name: GbE 11
+    type: 1000base-t
+  - name: GbE 12
+    type: 1000base-t
+  - name: 2.5 GbE 13
+    type: 2.5gbase-t
+  - name: 2.5 GbE 14
+    type: 2.5gbase-t
+  - name: 2.5 GbE 15
+    type: 2.5gbase-t
+  - name: 2.5 GbE 16
+    type: 2.5gbase-t
+  - name: SFP+ 1
+    type: 10gbase-x-sfpp
+  - name: SFP+ 2
+    type: 10gbase-x-sfpp
+power-ports:
+  - name: Input
+    type: usb-c
+    maximum_draw: 25