diff --git a/device-types/Ubiquiti/UNVR.yaml b/device-types/Ubiquiti/UNVR.yaml
new file mode 100644
index 000000000..9a926d71c
--- /dev/null
+++ b/device-types/Ubiquiti/UNVR.yaml
@@ -0,0 +1,25 @@
+---
+manufacturer: Ubiquiti
+model: UniFi Protect Network Video Recorder
+slug: unifi-protect-network-video-recorder
+part_number: UNVR
+comments: |
+  Network Video Recorder with four bays,
+
+  Dimensions: 442.4 x 325 x 43.7 mm (17.4 x 12.8 x 1.7")
+u_height: 1
+is_full_depth: true
+interfaces:
+  - name: LAN 1
+    type: 1000base-t
+  - name: SFP+ 2 (LAN)
+    type: 10gbase-x-sfpp
+power-ports:
+  - name: Supply
+    type: iec-60320-c14
+    maximum_draw: 100
+  - name: USP-RPS connector for PSU failover
+    # TODO: There is no proper DC "terminalblock" connection type defined
+    type: iec-60320-c20
+    # USP-RPS DC input, 11.5VDC, 10.43A
+    maximum_draw: 100
diff --git a/device-types/Ubiquiti/USW-Aggregation.yaml b/device-types/Ubiquiti/USW-Aggregation.yaml
new file mode 100644
index 000000000..ad732681d
--- /dev/null
+++ b/device-types/Ubiquiti/USW-Aggregation.yaml
@@ -0,0 +1,36 @@
+---
+manufacturer: Ubiquiti
+model: UniFi Switch Aggregation
+slug: unifi-switch-aggregation
+part_number: USW-Aggregation
+comments: |
+  UniFi Switch 16 Aggregation, 10G 10-Port Managed Aggregation Switch, 30W, (10) SFP+
+
+  Dimensions: 442.4 x 120 x 43.7 mm (17.42 x 4.72 x 1.72")
+u_height: 1
+is_full_depth: false
+interfaces:
+  - name: SFP+ 1
+    type: 10gbase-x-sfpp
+  - name: SFP+ 2
+    type: 10gbase-x-sfpp
+  - name: SFP+ 3
+    type: 10gbase-x-sfpp
+  - name: SFP+ 4
+    type: 10gbase-x-sfpp
+  - name: SFP+ 5
+    type: 10gbase-x-sfpp
+  - name: SFP+ 6
+    type: 10gbase-x-sfpp
+  - name: SFP+ 7
+    type: 10gbase-x-sfpp
+  - name: SFP+ 8
+    type: 10gbase-x-sfpp
+  - name: SFP+ 9
+    type: 10gbase-x-sfpp
+  - name: SFP+ 10
+    type: 10gbase-x-sfpp
+power-ports:
+  - name: Input
+    type: iec-60320-c14
+    maximum_draw: 30