diff --git a/device-types/Ubiquiti/E7-Audience-US.yaml b/device-types/Ubiquiti/E7-Audience-US.yaml
new file mode 100644
index 000000000..35f014cbd
--- /dev/null
+++ b/device-types/Ubiquiti/E7-Audience-US.yaml
@@ -0,0 +1,43 @@
+---
+manufacturer: Ubiquiti
+model: E7 Audience US
+part_number: E7-Audience-US
+slug: ubiquiti-e7-audience-us
+u_height: 0
+is_full_depth: false
+airflow: passive
+comments: |
+  High-performance WiFi 7 access point with dual-band 5 GHz and 6 GHz connectivity, high selectivity PRISM RF filtering technology, and support for 1,500+ clients.
+  Dimensions: 18.7 x 10.5 x 1.7 in (Device), 5.9 x 4.5 x 4.9 in (Bracket)
+  Weight: 7.3 lb (Without mount), 9.5 lb (With mount)
+  Certifications: FCC, IC
+  [UniFi E7 Audience US Techspecs](https://techspecs.ui.com/unifi/wifi/e7-audience-us)
+weight: 7.3
+weight_unit: lb
+front_image: true
+interfaces:
+  - name: Port 1
+    type: 10gbase-t
+    poe_mode: pd
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: Port 2
+    type: 1000base-t
+    poe_mode: pd
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: WLAN 0
+    type: ieee802.11ac
+    label: 5 GHz
+    description: |
+      Max Data Rate: 8.6 Gbps (BW240), MIMO: 4x4 (DL/UL MU-MIMO), Max TX Power: 30 dBm, Antenna Gain: 15 dBi (Small Cell), 11 dBi (Large Cell)
+  - name: WLAN 1
+    type: ieee802.11be
+    label: 6 GHz (WiFi 7)
+    description: |
+      Max Data Rate: 11.5 Gbps (BW320), MIMO: 4x4 (DL/UL MU-MIMO), Max TX Power: 30 dBm (36 dBm EIRP with Extended Range), Antenna Gain: 15 dBi (Small Cell), 11 dBi (Large Cell)
+  - name: WLAN 2
+    type: other-wireless
+    label: Spectral Analyzer
+    description: |
+      Dedicated spectral analysis radio for interference mitigation and spectrum monitoring.
diff --git a/device-types/Ubiquiti/E7-Campus-US.yaml b/device-types/Ubiquiti/E7-Campus-US.yaml
new file mode 100644
index 000000000..4523afdd6
--- /dev/null
+++ b/device-types/Ubiquiti/E7-Campus-US.yaml
@@ -0,0 +1,49 @@
+---
+manufacturer: Ubiquiti
+model: E7 Campus
+part_number: E7-Campus-US
+slug: ubiquiti-e7-campus-us
+u_height: 0
+is_full_depth: false
+comments: |
+  High-performance outdoor WiFi 7 access point with dual PoE support for high availability, PRISM RF filtering technology, dedicated spectral analyzer, and tri-band connectivity for 2.4 GHz, 5 GHz, and 6 GHz.
+  Weatherproofing: IPX6 (IP67 with Waterproof Door Kit)
+  Wind Survivability: 37 lbf at 125 mph
+  Dimensions: 9.8 x 9.8 x 1.8 in (Device), 4.1 x 5.9 in (Articulating mount)
+  Weight: 4.9 lb (Device), 2 lb (Articulating mount)
+  Certifications: FCC, IC
+  [UniFi E7 Campus Techspecs](https://techspecs.ui.com/unifi/wifi/e7-campus-us)
+airflow: passive
+weight: 4.9
+weight_unit: lb
+front_image: true
+interfaces:
+  - name: Port 1
+    type: 10gbase-t
+    poe_mode: pd
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: Port 2
+    type: 1000base-t
+    poe_mode: pd
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: WLAN 0
+    type: ieee802.11n
+    label: 2.4 GHz
+    description: |
+      Max Data Rate: 688 Mbps (BW40), MIMO: 2x2 (DL/UL MU-MIMO), Max TX Power: 23 dBm, Antenna Gain: 9 dBi
+  - name: WLAN 1
+    type: ieee802.11ac
+    label: 5 GHz
+    description: |
+      Max Data Rate: 8.6 Gbps (BW240), MIMO: 4x4 (DL/UL MU-MIMO), Max TX Power: 30 dBm, Antenna Gain: 12 dBi
+  - name: WLAN 2
+    type: ieee802.11be
+    label: 6 GHz (WiFi 7)
+    description: |
+      Max Data Rate: 11.5 Gbps (BW320), MIMO: 4x4 (DL/UL MU-MIMO), Max TX Power: 30 dBm (36 dBm EIRP with Extended Range Mode), Antenna Gain: 12 dBi
+  - name: Spectrum Radio
+    type: other-wireless
+    description: |
+      Dedicated spectral analysis radio for interference mitigation and spectrum monitoring.
diff --git a/device-types/Ubiquiti/E7.yaml b/device-types/Ubiquiti/E7.yaml
new file mode 100644
index 000000000..f7a726d93
--- /dev/null
+++ b/device-types/Ubiquiti/E7.yaml
@@ -0,0 +1,47 @@
+---
+manufacturer: Ubiquiti
+model: E7
+part_number: E7
+slug: ubiquiti-e7
+u_height: 0
+is_full_depth: false
+comments: |
+  High-performance WiFi 7 access point with dual PoE support for high availability, dedicated spectral analyzer, and tri-band connectivity for 2.4 GHz, 5 GHz, and 6 GHz.
+  Dimensions: 9.8 x 9.8 x 1.7 in
+  Weight: 4 lb
+  Certifications: CE, FCC, IC
+  [UniFi E7 Techspecs](https://techspecs.ui.com/unifi/wifi/e7)
+airflow: passive
+weight: 4
+weight_unit: lb
+front_image: true
+interfaces:
+  - name: Port 1
+    type: 10gbase-t
+    poe_mode: pd
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: Port 2
+    type: 1000base-t
+    poe_mode: pd
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: WLAN 0
+    type: ieee802.11n
+    label: 2.4 GHz
+    description: |
+      Max Data Rate: 688 Mbps (BW40), MIMO: 2x2 (DL/UL MU-MIMO), Max TX Power: 23 dBm, Antenna Gain: 5 dBi
+  - name: WLAN 1
+    type: ieee802.11ac
+    label: 5 GHz
+    description: |
+      Max Data Rate: 8.6 Gbps (BW240), MIMO: 4x4 (DL/UL MU-MIMO), Max TX Power: 30 dBm, Antenna Gain: 6 dBi
+  - name: WLAN 2
+    type: ieee802.11be
+    label: 6 GHz (WiFi 7)
+    description: |
+      Max Data Rate: 11.5 Gbps (BW320), MIMO: 4x4 (DL/UL MU-MIMO), Max TX Power: 24 dBm (30 dBm with Extended Range Mode), Antenna Gain: 6 dBi
+  - name: Spectrum Radio
+    type: other-wireless
+    description: |
+      Dedicated spectral analysis radio for interference mitigation and spectrum monitoring.
diff --git a/device-types/Ubiquiti/ECS-Aggregation.yaml b/device-types/Ubiquiti/ECS-Aggregation.yaml
new file mode 100644
index 000000000..f8399d906
--- /dev/null
+++ b/device-types/Ubiquiti/ECS-Aggregation.yaml
@@ -0,0 +1,138 @@
+---
+manufacturer: Ubiquiti
+model: Enterprise Campus Aggregation
+slug: ubiquiti-enterprise-campus-aggregation
+part_number: ECS-Aggregation
+comments: |
+  [Enterprise Campus Aggregation](https://store.ui.com/products/ecs-aggregation)
+
+  High-performance campus aggregation switch with (48) 25/10G SFP28 ports and (6) 100/40G QSFP28 ports. Ideal for high-throughput campus environments with total non-blocking throughput of 1.8 Tbps.
+
+  Dimensions: 442.4 x 43.7 x 496 mm (17.4 x 1.7 x 19.5")
+  Weight: 9.9 kg (21.8 lb)
+  Max Power Consumption: 340W
+  Certifications: CE, FCC, IC
+
+u_height: 1
+is_full_depth: false
+airflow: front-to-rear
+front_image: true
+rear_image: true
+interfaces:
+  # SFP28 ports (25/10G, 1-48)
+  - name: SFP28 Port 1
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 2
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 3
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 4
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 5
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 6
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 7
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 8
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 9
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 10
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 11
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 12
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 13
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 14
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 15
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 16
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 17
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 18
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 19
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 20
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 21
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 22
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 23
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 24
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 25
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 26
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 27
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 28
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 29
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 30
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 31
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 32
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 33
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 34
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 35
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 36
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 37
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 38
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 39
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 40
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 41
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 42
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 43
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 44
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 45
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 46
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 47
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 48
+    type: 25gbase-x-sfp28
+  # QSFP28 ports (100/40G, 49-54)
+  - name: QSFP28 Port 49
+    type: 100gbase-x-qsfp28
+  - name: QSFP28 Port 50
+    type: 100gbase-x-qsfp28
+  - name: QSFP28 Port 51
+    type: 100gbase-x-qsfp28
+  - name: QSFP28 Port 52
+    type: 100gbase-x-qsfp28
+  - name: QSFP28 Port 53
+    type: 100gbase-x-qsfp28
+  - name: QSFP28 Port 54
+    type: 100gbase-x-qsfp28
+module-bays:
+  - name: PSU 1
+    position: left
+    installed_module: ubiquiti-uacc-psu-12v-550w
+  - name: PSU 2
+    position: right
+    installed_module: ubiquiti-uacc-psu-12v-550w
diff --git a/device-types/Ubiquiti/EFG.yaml b/device-types/Ubiquiti/EFG.yaml
new file mode 100644
index 000000000..1fcca4668
--- /dev/null
+++ b/device-types/Ubiquiti/EFG.yaml
@@ -0,0 +1,47 @@
+---
+manufacturer: Ubiquiti
+model: Enterprise Fortress Gateway
+slug: ubiquiti-enterprise-fortress-gateway
+part_number: EFG
+comments: |
+  [Enterprise Fortress Gateway](https://store.ui.com/products/enterprise-fortress-gateway)
+
+  High-performance enterprise gateway with (2) 2.5GbE RJ45 ports, (2) 10G SFP+ ports, and (2) 25G SFP28 ports. Supports redundant WAN failover and load balancing.
+
+  Dimensions: 442.4 x 43.7 x 325 mm (17.4 x 1.7 x 12.8")
+  Weight: 6.5 kg (14.3 lb)
+  Max Power Consumption: 82W
+  Certifications: CE, FCC, IC
+
+u_height: 1
+is_full_depth: false
+airflow: front-to-rear
+front_image: true
+rear_image: true
+interfaces:
+  # RJ45 2.5GbE Ports (1-2)
+  - name: Port 1
+    type: 2.5gbase-t
+    label: Default WAN 1
+  - name: Port 2
+    type: 2.5gbase-t
+
+  # SFP+ 10GbE Ports (3-4)
+  - name: Port 3
+    type: 10gbase-x-sfpp
+  - name: Port 4
+    type: 10gbase-x-sfpp
+
+  # SFP28 25GbE Ports (5-6)
+  - name: Port 5
+    type: 25gbase-x-sfp28
+    label: Default WAN 2
+  - name: Port 6
+    type: 25gbase-x-sfp28
+module-bays:
+  - name: PSU 1
+    position: left
+    installed_module: ubiquiti-uacc-psu-12v-150w
+  - name: PSU 2
+    position: right
+    installed_module: ubiquiti-uacc-psu-12v-150w
diff --git a/device-types/Ubiquiti/ENVR.yaml b/device-types/Ubiquiti/ENVR.yaml
new file mode 100644
index 000000000..c2c10305c
--- /dev/null
+++ b/device-types/Ubiquiti/ENVR.yaml
@@ -0,0 +1,32 @@
+---
+manufacturer: Ubiquiti
+model: Enterprise Network Video Recorder
+slug: ubiquiti-enterprise-network-video-recorder
+part_number: ENVR
+airflow: front-to-rear
+comments: |
+  Enterprise-grade 4U NVR with 16 bays for high-capacity video storage.
+
+  Dimensions: 481.4 x 480 x 132 mm (19 x 18.9 x 5.2")
+  Weight: 36.6 lb
+  Certifications: FCC, CE, IC
+
+  [Enterprise Network Video Recorder Techspecs](https://techspecs.ui.com/unifi/cameras-nvrs/envr)
+u_height: 4
+is_full_depth: false
+front_image: true
+rear_image: true
+weight: 36.6
+weight_unit: lb
+interfaces:
+  - name: LAN 1
+    type: 10gbase-t
+  - name: SFP+ 1
+    type: 10gbase-x-sfpp
+  - name: SFP+ 2
+    type: 10gbase-x-sfpp
+module-bays:
+  - name: PSU1
+    position: '1'
+  - name: PSU2
+    position: '2'
diff --git a/device-types/Ubiquiti/U7-Outdoor.yaml b/device-types/Ubiquiti/U7-Outdoor.yaml
new file mode 100644
index 000000000..44ba6987c
--- /dev/null
+++ b/device-types/Ubiquiti/U7-Outdoor.yaml
@@ -0,0 +1,34 @@
+---
+manufacturer: Ubiquiti
+model: U7 Outdoor
+part_number: U7-Outdoor
+slug: ubiquiti-u7-outdoor
+u_height: 0
+is_full_depth: false
+airflow: passive
+weight: 1.2
+weight_unit: kg
+comments: |
+  The U7 Outdoor has the following antenna configurations and stats:
+  - (1) Directional internal antenna:
+    - 2.4 GHz: 8 dBi gain, 90deg beamwidth
+    - 5 GHz: 12.5 dBi gain, 45deg beamwidth
+  - (2) External omni antennas:
+    - 2.4 GHz: 3 dBi gain
+    - 5 GHz: 4 dBi gain
+  - (2) RP-SMA connectors for external antennas
+  Additional features:
+  - Weatherproofing: IPX6
+  - Wind survivability: 74.6 N at 200 km/h (16.8 lbf at 125 mph)
+interfaces:
+  - name: Port 1
+    type: 2.5gbase-t
+    poe_mode: pd
+    poe_type: type2-ieee802.3at
+    mgmt_only: true
+  - name: Wlan 0
+    type: ieee802.11n
+  - name: Wlan 1
+    type: ieee802.11ac
+  - name: Wlan 2
+    type: ieee802.11ax
diff --git a/device-types/Ubiquiti/U7-Pro-Max.yaml b/device-types/Ubiquiti/U7-Pro-Max.yaml
new file mode 100644
index 000000000..ac1825358
--- /dev/null
+++ b/device-types/Ubiquiti/U7-Pro-Max.yaml
@@ -0,0 +1,50 @@
+---
+manufacturer: Ubiquiti
+model: U7 Pro Max
+part_number: U7-Pro-Max
+slug: ubiquiti-u7-pro-max
+u_height: 0
+is_full_depth: false
+comments: |
+  [Access Point U7 Pro Max](https://store.ui.com/us/en/category/wifi-flagship/products/u7-pro-max)
+
+  High-performance WiFi 7 access point with 2.5GbE support and tri-band connectivity for 2.4 GHz, 5 GHz, and 6 GHz. Capable of MU-MIMO with 500+ concurrent clients.
+
+  Dimensions: 206 x 46 mm (8.1 x 1.8")
+  Weight: 680 g (1.5 lb)
+  Certifications: CE, FCC, IC
+airflow: passive
+weight: 680
+weight_unit: g
+front_image: true
+interfaces:
+  - name: Port 1
+    type: 2.5gbase-t
+    poe_mode: pd
+    poe_type: type2-ieee802.3at
+    mgmt_only: false
+  - name: WLAN 0
+    type: ieee802.11n
+    label: 2.4 GHz
+    description: |
+      Max Data Rate: 688 Mbps (BW40), MIMO: 2x2 (DL/UL MU-MIMO), Max TX Power: 23 dBm, Antenna Gain: 4 dBi
+  - name: WLAN 1
+    type: ieee802.11ac
+    label: 5 GHz
+    description: |
+      Max Data Rate: 8.6 Gbps (BW240), MIMO: 4x4 (DL/UL MU-MIMO), Max TX Power: 29 dBm, Antenna Gain: 6 dBi
+  - name: WLAN 2
+    type: ieee802.11ax
+    label: 6 GHz (WiFi 6E)
+    description: |
+      Max Data Rate: 5.7 Gbps (BW320), MIMO: 2x2 (DL/UL MU-MIMO), Max TX Power: 23 dBm, Antenna Gain: 5.9 dBi
+  - name: WLAN 3
+    type: ieee802.11be
+    label: 5 GHz (WiFi 7)
+    description: |
+      Max Data Rate: 8.6 Gbps (BW240), MIMO: 4x4 (DL/UL MU-MIMO), Max TX Power: 29 dBm, Antenna Gain: 6 dBi
+  - name: WLAN 4
+    type: ieee802.11be
+    label: 6 GHz (WiFi 7)
+    description: |
+      Max Data Rate: 5.7 Gbps (BW320), MIMO: 2x2 (DL/UL MU-MIMO), Max TX Power: 23 dBm, Antenna Gain: 5.9 dBi
diff --git a/device-types/Ubiquiti/UACC-Rack-Panel-Patch-Blank-24.yaml b/device-types/Ubiquiti/UACC-Rack-Panel-Patch-Blank-24.yaml
new file mode 100644
index 000000000..3d039294b
--- /dev/null
+++ b/device-types/Ubiquiti/UACC-Rack-Panel-Patch-Blank-24.yaml
@@ -0,0 +1,74 @@
+---
+manufacturer: Ubiquiti
+model: 24-Port Blank Keystone Patch Panel
+slug: ubiquiti-uacc-rack-panel-patch-blank-24
+part_number: UACC-Rack-Panel-Patch-Blank-24
+u_height: 1
+is_full_depth: false
+subdevice_role: parent
+comments: |
+  [Ubiquiti 24-Port Keystone Patch Panel](https://store.ui.com)
+
+  Dimensions:
+  - Standalone insert: 442.4 x 63.5 x 43.7 mm (17.4 x 2.5 x 1.7")
+  - Management bar: 433.8 x 71.5 x 17 mm (17.1 x 2.8 x 0.7")
+
+  Weight:
+  - Standalone insert: 260 g (9.17 oz)
+  - Management bar: 390 g (13.8 oz)
+
+  Materials:
+  - Front panel housing: Cold rolled carbon steel (SPCC)
+  - Inner module: Polycarbonate
+  - Management bar: Cold rolled carbon steel (SPCC)
+module-bays:
+  - name: '1'
+    position: '1'
+  - name: '2'
+    position: '2'
+  - name: '3'
+    position: '3'
+  - name: '4'
+    position: '4'
+  - name: '5'
+    position: '5'
+  - name: '6'
+    position: '6'
+  - name: '7'
+    position: '7'
+  - name: '8'
+    position: '8'
+  - name: '9'
+    position: '9'
+  - name: '10'
+    position: '10'
+  - name: '11'
+    position: '11'
+  - name: '12'
+    position: '12'
+  - name: '13'
+    position: '13'
+  - name: '14'
+    position: '14'
+  - name: '15'
+    position: '15'
+  - name: '16'
+    position: '16'
+  - name: '17'
+    position: '17'
+  - name: '18'
+    position: '18'
+  - name: '19'
+    position: '19'
+  - name: '20'
+    position: '20'
+  - name: '21'
+    position: '21'
+  - name: '22'
+    position: '22'
+  - name: '23'
+    position: '23'
+  - name: '24'
+    position: '24'
+front_image: true
+rear_image: true
diff --git a/device-types/Ubiquiti/UNAS-Pro.yaml b/device-types/Ubiquiti/UNAS-Pro.yaml
new file mode 100644
index 000000000..72ac5c38a
--- /dev/null
+++ b/device-types/Ubiquiti/UNAS-Pro.yaml
@@ -0,0 +1,38 @@
+---
+manufacturer: Ubiquiti
+model: UNAS Pro
+slug: ubiquiti-unas-pro
+part_number: UNAS-Pro
+airflow: front-to-rear
+comments: |
+  Enterprise-grade 7-bay NAS for data storage.
+
+  Dimensions: 442 x 325 x 87 mm (17.4 x 12.8 x 3.4")
+  Weight: 20.3 lb (without mounting brackets)
+  Certifications: FCC, CE, IC
+  Processor: Quad-Core ARM Cortex-A57 at 1.7 GHz
+  Memory: 8 GB
+  Display: 1.3" touchscreen LCM
+
+  [UNAS Pro Techspecs](https://techspecs.ui.com/unifi/integrations/unas-pro)
+u_height: 2
+is_full_depth: false
+front_image: true
+rear_image: true
+weight: 20.3
+weight_unit: lb
+interfaces:
+  - name: LAN 1
+    type: 1000base-t
+  - name: SFP+ 1
+    type: 10gbase-x-sfpp
+  - name: Bluetooth Interface
+    type: other
+    label: Bluetooth 4.1
+power-ports:
+  - name: AC Input
+    type: iec-60320-c14
+    maximum_draw: 200
+  - name: USP-RPS DC Input
+    type: ubiquiti-smartpower
+    maximum_draw: 160
diff --git a/device-types/Ubiquiti/UNVR-Pro.yaml b/device-types/Ubiquiti/UNVR-Pro.yaml
index 504040fa4..ea0909f4b 100644
--- a/device-types/Ubiquiti/UNVR-Pro.yaml
+++ b/device-types/Ubiquiti/UNVR-Pro.yaml
@@ -3,22 +3,27 @@ manufacturer: Ubiquiti
 model: UniFi Protect Network Video Recorder Pro
 slug: ubiquiti-unifi-protect-network-video-recorder-pro
 part_number: UNVR-Pro
+airflow: front-to-rear
 comments: |
-  Network Video Recorder with seven bays,
+  Network Video Recorder with seven bays.
 
   Dimensions: 442 x 325 x 87 mm (17.4 x 12.8 x 3.4")
+  [UniFi Protect Network Video Recorder Pro Techspecs](https://techspecs.ui.com/unifi/cameras-nvrs/unvr-pro)
 u_height: 2
-is_full_depth: true
+is_full_depth: false
+front_image: true
+rear_image: true
+weight: 20.8
+weight_unit: lb
 interfaces:
   - name: LAN 1
     type: 1000base-t
   - name: SFP+ 2 (LAN)
     type: 10gbase-x-sfpp
 power-ports:
-  - name: Supply
+  - name: Input
     type: iec-60320-c14
-    maximum_draw: 100
+    maximum_draw: 160
   - name: USP-RPS connector for PSU failover
     type: ubiquiti-smartpower
-    # USP-RPS DC input, 11.5VDC, 10.43A
     maximum_draw: 160
diff --git a/device-types/Ubiquiti/UNVR.yaml b/device-types/Ubiquiti/UNVR.yaml
index 9688d4fb9..253ed0033 100644
--- a/device-types/Ubiquiti/UNVR.yaml
+++ b/device-types/Ubiquiti/UNVR.yaml
@@ -3,23 +3,27 @@ manufacturer: Ubiquiti
 model: UniFi Protect Network Video Recorder
 slug: ubiquiti-unifi-protect-network-video-recorder
 part_number: UNVR
+airflow: front-to-rear
 comments: |
-  Network Video Recorder with four bays,
+  Network Video Recorder with four bays.
 
   Dimensions: 442.4 x 325 x 43.7 mm (17.4 x 12.8 x 1.7")
+  [UniFi Protect Network Video Recorder Techspecs](https://techspecs.ui.com/unifi/cameras-nvrs/unvr)
 u_height: 1
-is_full_depth: true
+is_full_depth: false
+front_image: true
+rear_image: true
+weight: 11.5
+weight_unit: lb
 interfaces:
   - name: LAN 1
     type: 1000base-t
   - name: SFP+ 2 (LAN)
     type: 10gbase-x-sfpp
 power-ports:
-  - name: Supply
+  - name: Input
     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
+    type: ubiquiti-smartpower
     maximum_draw: 100
diff --git a/device-types/Ubiquiti/USP-PDU-HD.yaml b/device-types/Ubiquiti/USP-PDU-HD.yaml
new file mode 100644
index 000000000..31525f698
--- /dev/null
+++ b/device-types/Ubiquiti/USP-PDU-HD.yaml
@@ -0,0 +1,92 @@
+---
+manufacturer: Ubiquiti
+model: USP PDU HD
+part_number: USP-PDU-HD
+slug: ubiquiti-usp-pdu-hd
+u_height: 0  # 0U, mounted at the back of the rack
+is_full_depth: false
+comments: |
+  High-density rack-mounted PDU with 24 managed outlets (125V AC, 15A Max.), 4 USB-C ports, and redundant network interfaces.
+  Dimensions: 1485 x 55 x 56 mm (58.5 x 2.17 x 2.2").
+airflow: passive
+weight: 6.3
+weight_unit: kg
+front_image: true
+rear_image: true
+interfaces:
+  - name: Management Port
+    type: 100base-tx
+    label: Management (RJ45)
+  - name: Network Port 1
+    type: 1000base-t
+    label: Network Redundancy Port 1
+  - name: Network Port 2
+    type: 1000base-t
+    label: Network Redundancy Port 2
+  - name: Network Port 3
+    type: 1000base-t
+    label: Network Redundancy Port 3
+power-ports:
+  - name: Power Input
+    type: nema-l5-30p
+    maximum_draw: 3750  # Total max draw in watts
+power-outlets:
+  # Bank 1: Outlets 1-12
+  - name: Outlet 1
+    type: nema-5-15r
+  - name: Outlet 2
+    type: nema-5-15r
+  - name: Outlet 3
+    type: nema-5-15r
+  - name: Outlet 4
+    type: nema-5-15r
+  - name: Outlet 5
+    type: nema-5-15r
+  - name: Outlet 6
+    type: nema-5-15r
+  - name: Outlet 7
+    type: nema-5-15r
+  - name: Outlet 8
+    type: nema-5-15r
+  - name: Outlet 9
+    type: nema-5-15r
+  - name: Outlet 10
+    type: nema-5-15r
+  - name: Outlet 11
+    type: nema-5-15r
+  - name: Outlet 12
+    type: nema-5-15r
+  # USB-C Ports (13-16)
+  - name: USB-C 13
+    type: usb-c
+  - name: USB-C 14
+    type: usb-c
+  - name: USB-C 15
+    type: usb-c
+  - name: USB-C 16
+    type: usb-c
+  # Bank 2: Outlets 17-28
+  - name: Outlet 17
+    type: nema-5-15r
+  - name: Outlet 18
+    type: nema-5-15r
+  - name: Outlet 19
+    type: nema-5-15r
+  - name: Outlet 20
+    type: nema-5-15r
+  - name: Outlet 21
+    type: nema-5-15r
+  - name: Outlet 22
+    type: nema-5-15r
+  - name: Outlet 23
+    type: nema-5-15r
+  - name: Outlet 24
+    type: nema-5-15r
+  - name: Outlet 25
+    type: nema-5-15r
+  - name: Outlet 26
+    type: nema-5-15r
+  - name: Outlet 27
+    type: nema-5-15r
+  - name: Outlet 28
+    type: nema-5-15r
diff --git a/device-types/Ubiquiti/USP-PDU-Pro.yaml b/device-types/Ubiquiti/USP-PDU-Pro.yaml
new file mode 100644
index 000000000..8bf2c4f77
--- /dev/null
+++ b/device-types/Ubiquiti/USP-PDU-Pro.yaml
@@ -0,0 +1,103 @@
+---
+manufacturer: Ubiquiti
+model: Power Distribution Pro
+slug: ubiquiti-usp-pdu-pro
+part_number: USP-PDU-Pro
+u_height: 2
+is_full_depth: false
+comments: |
+  [Power Distribution Pro](https://store.ui.com/products/usp-pdu-pro)
+
+  2U rack-mounted power distribution unit with (16) controllable power outlets, (4) USB-C ports, and (4) Ethernet ports for monitoring and control.
+
+  Dimensions: 442.4 x 87.4 x 106 mm (17.4 x 3.4 x 4.2")
+airflow: passive
+weight: 3.7
+weight_unit: kg
+interfaces:
+  - name: Port 21
+    type: 100base-tx
+    label: Main Internet
+    mgmt_only: true
+  - name: Port 22
+    type: 1000base-t
+    label: Reserved for future use
+    mgmt_only: true
+  - name: Port 23
+    type: 1000base-t
+    label: Reserved for future use
+    mgmt_only: true
+  - name: Port 24
+    type: 1000base-t
+    label: Reserved for future use
+    mgmt_only: true
+power-ports:
+  - name: Input
+    type: nema-5-15p
+    maximum_draw: 1875
+    description: 125V AC, 15A Max., 50/60 Hz
+power-outlets:
+  # USB-C Ports
+  - name: Outlet 1
+    type: usb-c
+    power_port: Input
+  - name: Outlet 2
+    type: usb-c
+    power_port: Input
+  - name: Outlet 3
+    type: usb-c
+    power_port: Input
+  - name: Outlet 4
+    type: usb-c
+    power_port: Input
+  # Power Control Outlets (Top Row: Ports 5-16)
+  - name: Outlet 5
+    type: nema-5-15r
+    power_port: Input
+  - name: Outlet 6
+    type: nema-5-15r
+    power_port: Input
+  - name: Outlet 7
+    type: nema-5-15r
+    power_port: Input
+  - name: Outlet 8
+    type: nema-5-15r
+    power_port: Input
+  - name: Outlet 9
+    type: nema-5-15r
+    power_port: Input
+  - name: Outlet 10
+    type: nema-5-15r
+    power_port: Input
+  - name: Outlet 11
+    type: nema-5-15r
+    power_port: Input
+  - name: Outlet 12
+    type: nema-5-15r
+    power_port: Input
+  - name: Outlet 13
+    type: nema-5-15r
+    power_port: Input
+  - name: Outlet 14
+    type: nema-5-15r
+    power_port: Input
+  - name: Outlet 15
+    type: nema-5-15r
+    power_port: Input
+  - name: Outlet 16
+    type: nema-5-15r
+    power_port: Input
+  # Power Control Outlets (Bottom Row: Ports 17-20)
+  - name: Outlet 17
+    type: nema-5-15r
+    power_port: Input
+  - name: Outlet 18
+    type: nema-5-15r
+    power_port: Input
+  - name: Outlet 19
+    type: nema-5-15r
+    power_port: Input
+  - name: Outlet 20
+    type: nema-5-15r
+    power_port: Input
+front_image: true
diff --git a/device-types/Ubiquiti/USP-RPS.yaml b/device-types/Ubiquiti/USP-RPS.yaml
index ff74e0fff..b64b5b514 100644
--- a/device-types/Ubiquiti/USP-RPS.yaml
+++ b/device-types/Ubiquiti/USP-RPS.yaml
@@ -5,13 +5,17 @@ slug: ubiquiti-unifi-smartpower-rps
 airflow: front-to-rear
 part_number: USP-RPS
 comments: |
-  [UniFi Power Backup](https://store.ui.com/products/usp-rps)
+  [UniFi Power Backup Techspecs](https://techspecs.ui.com/unifi/power-tech/usp-rps)
 
   950W backup power unit that provides full redundancy for rack-mounted UniFi devices.
 
   Dimensions: 442.4 x 43.7 x 325.6 mm (17.42 x 1.72 x 12.82")
 u_height: 1
+weight: 12.3
+weight_unit: lb
 is_full_depth: false
+front_image: true
+rear_image: true
 interfaces:
   - name: Port 1
     type: 1000base-t
diff --git a/device-types/Ubiquiti/USW-Aggregation.yaml b/device-types/Ubiquiti/USW-Aggregation.yaml
index 9aa0ad934..6da18f320 100644
--- a/device-types/Ubiquiti/USW-Aggregation.yaml
+++ b/device-types/Ubiquiti/USW-Aggregation.yaml
@@ -7,6 +7,8 @@ comments: |
   UniFi Switch Aggregation, 10G 8-Port Managed Aggregation Switch, 30W, (8) SFP+
 
   Dimensions: 442.4 x 120 x 43.7 mm (17.42 x 4.72 x 1.72")
+
+  [USW-Aggregation Techspecs]https://techspecs.ui.com/unifi/switching/usw-pro-aggregation
 u_height: 1
 weight: 2.7
 weight_unit: kg
diff --git a/device-types/Ubiquiti/USW-Enterprise-24-PoE.yaml b/device-types/Ubiquiti/USW-Enterprise-24-PoE.yaml
index eb344b539..936bc4b4d 100644
--- a/device-types/Ubiquiti/USW-Enterprise-24-PoE.yaml
+++ b/device-types/Ubiquiti/USW-Enterprise-24-PoE.yaml
@@ -3,16 +3,19 @@ manufacturer: Ubiquiti
 model: UniFi Switch Enterprise 24 PoE
 slug: ubiquiti-unifi-switch-enterprise-24-poe
 part_number: USW-Enterprise-24-PoE
-comments: 'UniFi Switch Enterprise 24 PoE (150W + max. 400W PoE), (12) 2.5 Gigabit PoE+ IEEE 802.3af/at, (12) 1 Gigabit PoE+ IEEE 802.3af/at, (2) SFP+\nDimensions:
-  442.4 x 43.7 x 325 mm (17.4 x 1.7 x 12.8")\n[Switch Enterprise 24 PoE Datasheet](https://dl.ui.com/ds/usw-enterprise-24-poe_ds)'
+comments: |
+  UniFi Switch Enterprise 24 PoE (150W + max. 400W PoE), (12) 2.5 Gigabit PoE+ IEEE 802.3af/at, (12) 1 Gigabit PoE+ IEEE 802.3af/at, (2) SFP+
+
+  Dimensions: 442.4 x 43.7 x 325 mm (17.4 x 1.7 x 12.8")
+
+  [Switch Enterprise 24 PoE Techspecs](https://techspecs.ui.com/unifi/switching/usw-enterprise-24-poe)
 u_height: 1
 is_full_depth: false
-weight: 11.46
+front_image: true
+rear_image: true
+weight: 11.5
 weight_unit: lb
-power-ports:
-  - name: PSU1
-    type: iec-60320-c14
-    maximum_draw: 550
+airflow: front-to-rear
 interfaces:
   - name: Port 1
     type: 1000base-t
@@ -114,3 +117,10 @@ interfaces:
     type: 10gbase-x-sfpp
   - name: SFP+ 26
     type: 10gbase-x-sfpp
+power-ports:
+  - name: Input
+    type: iec-60320-c14
+    maximum_draw: 460
+  - name: USP-RPS connector for PSU failover
+    type: ubiquiti-smartpower
+    maximum_draw: 460
diff --git a/device-types/Ubiquiti/USW-Enterprise-48-PoE.yaml b/device-types/Ubiquiti/USW-Enterprise-48-PoE.yaml
index 06594faa6..51e348504 100644
--- a/device-types/Ubiquiti/USW-Enterprise-48-PoE.yaml
+++ b/device-types/Ubiquiti/USW-Enterprise-48-PoE.yaml
@@ -6,9 +6,15 @@ part_number: USW-Enterprise-48-PoE
 comments: |
   UniFi Switch Enterprise 48 PoE (150W + max. 720W PoE), (48) 2.5 Gigabit PoE+ IEEE 802.3af/at, (4) SFP+
 
-  Dimensions: 442 x 44 x 400 mm (17.4 x 1.7 x 15.7")
+  Dimensions: 442.4 x 43.7 x 325 mm (17.4 x 1.7 x 12.8")
+  [Switch Enterprise 48 PoE Techspecs](https://techspecs.ui.com/unifi/switching/usw-enterprise-48-poe)
 u_height: 1
-is_full_depth: true
+is_full_depth: false
+front_image: true
+rear_image: true
+weight: 13.9
+weight_unit: lb
+airflow: front-to-rear
 interfaces:
   - name: Port 1
     type: 2.5gbase-t
@@ -214,3 +220,6 @@ power-ports:
   - name: Input
     type: iec-60320-c14
     maximum_draw: 870
+  - name: USP-RPS connector for PSU failover
+    type: ubiquiti-smartpower
+    maximum_draw: 600
diff --git a/device-types/Ubiquiti/USW-Pro-24-PoE.yaml b/device-types/Ubiquiti/USW-Pro-24-PoE.yaml
index 252bb3050..eceb8c4ad 100644
--- a/device-types/Ubiquiti/USW-Pro-24-PoE.yaml
+++ b/device-types/Ubiquiti/USW-Pro-24-PoE.yaml
@@ -2,15 +2,19 @@
 manufacturer: Ubiquiti
 model: UniFi Switch 24 Pro PoE Gen2
 slug: ubiquiti-unifi-switch-24-pro-poe-gen2
-part_number: USW-PRO-24-POE
+part_number: USW-Pro-24-POE
 comments: |
   UniFi Switch 24 Pro PoE (50W + max. 400W PoE), Gen2, (24) Gigabit, (1-16) Gigabit PoE+ IEEE 802.3af/at, (17-24) Gigabit 60W PoE++ IEEE 802.3bt, (2) SFP+
 
   Dimensions: 442.4 x 285.4 x 43.7 mm (17.42 x 11.24 x 1.72")
+  [Switch Switch 24 Pro PoE Techspecs](https://techspecs.ui.com/unifi/switching/usw-pro-24-poe)
 u_height: 1
 is_full_depth: false
 front_image: true
 rear_image: true
+weight: 9.7
+weight_unit: lb
+airflow: front-to-rear
 interfaces:
   - name: Port 1
     type: 1000base-t
@@ -116,3 +120,6 @@ power-ports:
   - name: Input
     type: iec-60320-c14
     maximum_draw: 450
+  - name: USP-RPS connector for PSU failover
+    type: ubiquiti-smartpower
+    maximum_draw: 450
diff --git a/device-types/Ubiquiti/USW-Pro-24.yaml b/device-types/Ubiquiti/USW-Pro-24.yaml
index 566a5048f..4b8bfc8b8 100644
--- a/device-types/Ubiquiti/USW-Pro-24.yaml
+++ b/device-types/Ubiquiti/USW-Pro-24.yaml
@@ -1,16 +1,21 @@
 ---
 manufacturer: Ubiquiti
-model: USW-PRO-24
-slug: ubiquiti-usw-pro-24
+model: UniFi Switch 24 Pro
+slug: ubiquiti-unifi-switch-24-pro
+part_number: USW-Pro-24
 comments: |
-  [UniFi Switch Pro 24](https://store.ui.com/collections/unifi-network-switching/products/usw-pro-24)
+  UniFi Switch 24 Pro (50W), (24) Gigabit, (1-16) Gigabit, (17-24) Gigabit, (2) SFP+
 
-  24-port switch with (24) Gigabit RJ45 ports and (2) 10G SFP+ ports. Powerful second-generation UniFi switching
+  Dimensions: 442.4 x 285 x 44 mm (17.4 x 11.2 x 1.7")
 
-  Dimensions: 442.4 x 285.4 x 43.7 mm (17.42 x 11.24 x 1.72")
+  [Switch Switch 24 Pro Techspecs](https://techspecs.ui.com/unifi/switching/usw-pro-24)
 u_height: 1
+is_full_depth: false
 front_image: true
-is_full_depth: true
+rear_image: true
+weight: 7.9
+weight_unit: lb
+airflow: front-to-rear
 interfaces:
   - name: Port 1
     type: 1000base-t
@@ -67,4 +72,7 @@ interfaces:
 power-ports:
   - name: Input
     type: iec-60320-c14
-    maximum_draw: 450
+    maximum_draw: 30
+  - name: USP-RPS connector for PSU failover
+    type: ubiquiti-smartpower
+    maximum_draw: 30
diff --git a/device-types/Ubiquiti/USW-Pro-48-PoE.yaml b/device-types/Ubiquiti/USW-Pro-48-PoE.yaml
index 9ea3d0fc8..774f5babc 100644
--- a/device-types/Ubiquiti/USW-Pro-48-PoE.yaml
+++ b/device-types/Ubiquiti/USW-Pro-48-PoE.yaml
@@ -7,8 +7,14 @@ comments: |
   UniFi Switch 48 Pro PoE (60W + max. 600W PoE), Gen2, (48) Gigabit, (1-40) Gigabit PoE+ IEEE 802.3af/at, (41-48) 60W PoE++ IEEE 802.3bt, (4) SFP+
 
   Dimensions: 442.4 x 399.6 x 43.7 mm (17.42 x 15.73 x 1.72")
+  [Switch Switch 48 Pro PoE Techspecs](https://techspecs.ui.com/unifi/switching/usw-pro-48-poe)
 u_height: 1
-is_full_depth: true
+is_full_depth: false
+front_image: true
+rear_image: true
+weight: 14
+weight_unit: lb
+airflow: front-to-rear
 interfaces:
   - name: Port 1
     type: 1000base-t
@@ -214,3 +220,6 @@ power-ports:
   - name: Input
     type: iec-60320-c14
     maximum_draw: 660
+  - name: USP-RPS connector for PSU failover
+    type: ubiquiti-smartpower
+    maximum_draw: 600
diff --git a/device-types/Ubiquiti/USW-Pro-48.yaml b/device-types/Ubiquiti/USW-Pro-48.yaml
index 9f5070cca..388d9c251 100644
--- a/device-types/Ubiquiti/USW-Pro-48.yaml
+++ b/device-types/Ubiquiti/USW-Pro-48.yaml
@@ -4,11 +4,17 @@ model: UniFi Switch 48 Pro
 slug: ubiquiti-unifi-switch-48-pro
 part_number: USW-Pro-48
 comments: |
-  UniFi Switch 48 Pro, Gen2, (48) Gigabit, (4) SFP+
+  UniFi Switch 48 Pro (60W), (48) Gigabit, (4) SFP+
 
-  Dimensions: 442.4 x 285.4 x 43.7 mm (17.42 x 15.73 x 1.72")
+  Dimensions: 442.4 x 285 x 44 mm (17.4 x 11.2 x 1.7")
+  [Switch Switch 48 Pro Techspecs](https://techspecs.ui.com/unifi/switching/usw-pro-48)
 u_height: 1
-is_full_depth: true
+is_full_depth: false
+front_image: true
+rear_image: true
+weight: 9
+weight_unit: lb
+airflow: front-to-rear
 interfaces:
   - name: Port 1
     type: 1000base-t
@@ -118,3 +124,6 @@ power-ports:
   - name: Input
     type: iec-60320-c14
     maximum_draw: 60
+  - name: USP-RPS connector for PSU failover
+    type: ubiquiti-smartpower
+    maximum_draw: 60
diff --git a/device-types/Ubiquiti/USW-Pro-Aggregation.yaml b/device-types/Ubiquiti/USW-Pro-Aggregation.yaml
index f43fb544b..d5d45aebc 100644
--- a/device-types/Ubiquiti/USW-Pro-Aggregation.yaml
+++ b/device-types/Ubiquiti/USW-Pro-Aggregation.yaml
@@ -4,11 +4,17 @@ model: UniFi Switch Pro Aggregation
 slug: ubiquiti-unifi-switch-pro-aggregation
 part_number: USW-Pro-Aggregation
 comments: |
-  UniFi Switch Pro Aggregation, 10G 28-Port and 25G 4-Port Managed Aggregation Switch, 100W, (28) SFP+ (4) SFP28
+  UniFi Switch Pro Aggregation, 10G 28-Port and 25G 4-Port Managed Aggregation Switch, 100W, (28) SFP+ (4) SFP28.
 
   Dimensions: 442 x 325 x 44 mm (17.4 x 12.8 x 1.7")
+  [UniFi Switch Pro Aggregation Techspecs](https://techspecs.ui.com/unifi/switching/usw-pro-aggregation)
 u_height: 1
 is_full_depth: false
+front_image: true
+rear_image: true
+weight: 10.4
+weight_unit: lb
+airflow: front-to-rear
 interfaces:
   - name: SFP+ 1
     type: 10gbase-x-sfpp
@@ -80,3 +86,4 @@ power-ports:
     maximum_draw: 100
   - name: USP-RPS DC input
     type: ubiquiti-smartpower
+    maximum_draw: 50
diff --git a/device-types/Ubiquiti/USW-Pro-Max-24-PoE.yaml b/device-types/Ubiquiti/USW-Pro-Max-24-PoE.yaml
index 74b4d77c3..9aee686a9 100644
--- a/device-types/Ubiquiti/USW-Pro-Max-24-PoE.yaml
+++ b/device-types/Ubiquiti/USW-Pro-Max-24-PoE.yaml
@@ -7,11 +7,14 @@ comments: |
   UniFi Switch 24 Pro Max PoE (50W + max. 400W PoE), (16) Gigabit + (8) 2.5GbE, (1-8) Gigabit PoE+ IEEE 802.3af/at, (9-16) Gigabit PoE++ IEEE 802.3bt, (17-24) 2.5GbE 60W PoE++ IEEE 802.3bt, (2) SFP+
 
   Dimensions: 442 x 325 x 44 mm (17.4 x 12.8 x 1.7")
+  [UniFi Switch Pro Max 24 PoE Techspecs](https://techspecs.ui.com/unifi/switching/usw-pro-max-24-poe)
 u_height: 1
-weight: 5.20
-weight_unit: kg
+weight: 11.5
+weight_unit: lb
 airflow: front-to-rear
 is_full_depth: false
+front_image: true
+rear_image: true
 interfaces:
   - name: Port 1
     type: 1000base-t
@@ -117,3 +120,6 @@ power-ports:
   - name: Input
     type: iec-60320-c14
     maximum_draw: 450
+  - name: USP-RPS connector for PSU failover
+    type: ubiquiti-smartpower
+    maximum_draw: 450
diff --git a/device-types/Ubiquiti/USW-Pro-Max-24.yaml b/device-types/Ubiquiti/USW-Pro-Max-24.yaml
new file mode 100644
index 000000000..ec6f3d93f
--- /dev/null
+++ b/device-types/Ubiquiti/USW-Pro-Max-24.yaml
@@ -0,0 +1,80 @@
+---
+manufacturer: Ubiquiti
+model: UniFi Switch Pro Max 24
+slug: ubiquiti-unifi-switch-pro-max-24
+part_number: USW-Pro-Max-24
+comments: |
+  UniFi Switch 24 Pro Max (non-PoE) with total non-blocking throughput of 56 Gbps. Features (16) Gigabit Ethernet ports, (8) 1/2.5GbE ports, and (2) 10G SFP+ uplink ports.
+
+  Dimensions: 442 x 325 x 44 mm (17.4 x 12.8 x 1.7")
+  [UniFi Switch Pro Max 24 Techspecs](https://techspecs.ui.com/unifi/switching/usw-pro-max-24)
+u_height: 1
+weight: 9.5
+weight_unit: lb
+airflow: front-to-rear
+is_full_depth: false
+front_image: true
+rear_image: true
+interfaces:
+  # Gigabit Ethernet ports (1-16)
+  - name: Port 1
+    type: 1000base-t
+  - name: Port 2
+    type: 1000base-t
+  - name: Port 3
+    type: 1000base-t
+  - name: Port 4
+    type: 1000base-t
+  - name: Port 5
+    type: 1000base-t
+  - name: Port 6
+    type: 1000base-t
+  - name: Port 7
+    type: 1000base-t
+  - name: Port 8
+    type: 1000base-t
+  - name: Port 9
+    type: 1000base-t
+  - name: Port 10
+    type: 1000base-t
+  - name: Port 11
+    type: 1000base-t
+  - name: Port 12
+    type: 1000base-t
+  - name: Port 13
+    type: 1000base-t
+  - name: Port 14
+    type: 1000base-t
+  - name: Port 15
+    type: 1000base-t
+  - name: Port 16
+    type: 1000base-t
+  # 2.5GbE Ethernet ports (17-24)
+  - name: Port 17
+    type: 2.5gbase-t
+  - name: Port 18
+    type: 2.5gbase-t
+  - name: Port 19
+    type: 2.5gbase-t
+  - name: Port 20
+    type: 2.5gbase-t
+  - name: Port 21
+    type: 2.5gbase-t
+  - name: Port 22
+    type: 2.5gbase-t
+  - name: Port 23
+    type: 2.5gbase-t
+  - name: Port 24
+    type: 2.5gbase-t
+  # SFP+ uplink ports (25-26)
+  - name: SFP+ 25
+    type: 10gbase-x-sfpp
+  - name: SFP+ 26
+    type: 10gbase-x-sfpp
+power-ports:
+  - name: AC Input
+    type: iec-60320-c14
+    maximum_draw: 50
+  - name: USP-RPS connector for PSU failover
+    type: ubiquiti-smartpower
+    maximum_draw: 50
diff --git a/device-types/Ubiquiti/USW-Pro-Max-48-PoE.yaml b/device-types/Ubiquiti/USW-Pro-Max-48-PoE.yaml
new file mode 100644
index 000000000..1fc7ed830
--- /dev/null
+++ b/device-types/Ubiquiti/USW-Pro-Max-48-PoE.yaml
@@ -0,0 +1,229 @@
+---
+manufacturer: Ubiquiti
+model: UniFi Switch Pro Max 48 PoE
+slug: ubiquiti-unifi-switch-pro-max-48-poe
+part_number: USW-Pro-Max-48-PoE
+comments: |
+  UniFi Switch 48 Pro Max PoE with total available PoE of 720W. Features (32) Gigabit PoE/PoE+ ports (including 8 PoE++), (16) 2.5GbE PoE++ ports, and (4) 10G SFP+ uplink ports.
+
+  Dimensions: 442.4 x 400 x 44 mm (17.4 x 15.7 x 1.7")
+  [UniFi Switch Pro Max 48 PoE Techspecs](https://techspecs.ui.com/unifi/switching/usw-pro-max-48-poe)
+u_height: 1
+weight: 13.9
+weight_unit: lb
+airflow: front-to-rear
+is_full_depth: false
+front_image: true
+rear_image: true
+interfaces:
+  # Gigabit PoE/PoE+ ports (1-24)
+  - name: Port 1
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 2
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 3
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 4
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 5
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 6
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 7
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 8
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 9
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 10
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 11
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 12
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 13
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 14
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 15
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 16
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 17
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 18
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 19
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 20
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 21
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 22
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 23
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 24
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  # Gigabit PoE++ ports (25-32)
+  - name: Port 25
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 26
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 27
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 28
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 29
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 30
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 31
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 32
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  # 2.5GbE PoE++ ports (33-48)
+  - name: Port 33
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 34
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 35
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 36
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 37
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 38
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 39
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 40
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 41
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 42
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 43
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 44
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 45
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 46
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 47
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 48
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  # SFP+ uplink ports (49-52)
+  - name: SFP+ 49
+    type: 10gbase-x-sfpp
+  - name: SFP+ 50
+    type: 10gbase-x-sfpp
+  - name: SFP+ 51
+    type: 10gbase-x-sfpp
+  - name: SFP+ 52
+    type: 10gbase-x-sfpp
+power-ports:
+  - name: AC Input
+    type: iec-60320-c14
+    maximum_draw: 820
+  - name: USP-RPS connector for PSU failover
+    type: ubiquiti-smartpower
+    maximum_draw: 600
diff --git a/device-types/Ubiquiti/USW-Pro-Max-48.yaml b/device-types/Ubiquiti/USW-Pro-Max-48.yaml
new file mode 100644
index 000000000..dd3eec48e
--- /dev/null
+++ b/device-types/Ubiquiti/USW-Pro-Max-48.yaml
@@ -0,0 +1,132 @@
+---
+manufacturer: Ubiquiti
+model: UniFi Switch Pro Max 48
+slug: ubiquiti-unifi-switch-pro-max-48
+part_number: USW-Pro-Max-48
+comments: |
+  UniFi Switch 48 Pro Max (non-PoE) with total non-blocking throughput of 112 Gbps. Features (32) Gigabit Ethernet ports, (16) 1/2.5GbE ports, and (4) 10G SFP+ uplink ports.
+
+  Dimensions: 442 x 325 x 44 mm (17.4 x 12.8 x 1.7")
+  [UniFi Switch Pro Max 48 Techspecs](https://techspecs.ui.com/unifi/switching/usw-pro-max-48)
+u_height: 1
+weight: 10.8
+weight_unit: lb
+airflow: front-to-rear
+is_full_depth: false
+front_image: true
+rear_image: true
+interfaces:
+  # Gigabit Ethernet ports (1-32)
+  - name: Port 1
+    type: 1000base-t
+  - name: Port 2
+    type: 1000base-t
+  - name: Port 3
+    type: 1000base-t
+  - name: Port 4
+    type: 1000base-t
+  - name: Port 5
+    type: 1000base-t
+  - name: Port 6
+    type: 1000base-t
+  - name: Port 7
+    type: 1000base-t
+  - name: Port 8
+    type: 1000base-t
+  - name: Port 9
+    type: 1000base-t
+  - name: Port 10
+    type: 1000base-t
+  - name: Port 11
+    type: 1000base-t
+  - name: Port 12
+    type: 1000base-t
+  - name: Port 13
+    type: 1000base-t
+  - name: Port 14
+    type: 1000base-t
+  - name: Port 15
+    type: 1000base-t
+  - name: Port 16
+    type: 1000base-t
+  - name: Port 17
+    type: 1000base-t
+  - name: Port 18
+    type: 1000base-t
+  - name: Port 19
+    type: 1000base-t
+  - name: Port 20
+    type: 1000base-t
+  - name: Port 21
+    type: 1000base-t
+  - name: Port 22
+    type: 1000base-t
+  - name: Port 23
+    type: 1000base-t
+  - name: Port 24
+    type: 1000base-t
+  - name: Port 25
+    type: 1000base-t
+  - name: Port 26
+    type: 1000base-t
+  - name: Port 27
+    type: 1000base-t
+  - name: Port 28
+    type: 1000base-t
+  - name: Port 29
+    type: 1000base-t
+  - name: Port 30
+    type: 1000base-t
+  - name: Port 31
+    type: 1000base-t
+  - name: Port 32
+    type: 1000base-t
+  # 2.5GbE Ethernet ports (33-48)
+  - name: Port 33
+    type: 2.5gbase-t
+  - name: Port 34
+    type: 2.5gbase-t
+  - name: Port 35
+    type: 2.5gbase-t
+  - name: Port 36
+    type: 2.5gbase-t
+  - name: Port 37
+    type: 2.5gbase-t
+  - name: Port 38
+    type: 2.5gbase-t
+  - name: Port 39
+    type: 2.5gbase-t
+  - name: Port 40
+    type: 2.5gbase-t
+  - name: Port 41
+    type: 2.5gbase-t
+  - name: Port 42
+    type: 2.5gbase-t
+  - name: Port 43
+    type: 2.5gbase-t
+  - name: Port 44
+    type: 2.5gbase-t
+  - name: Port 45
+    type: 2.5gbase-t
+  - name: Port 46
+    type: 2.5gbase-t
+  - name: Port 47
+    type: 2.5gbase-t
+  - name: Port 48
+    type: 2.5gbase-t
+  # SFP+ uplink ports (49-52)
+  - name: SFP+ 49
+    type: 10gbase-x-sfpp
+  - name: SFP+ 50
+    type: 10gbase-x-sfpp
+  - name: SFP+ 51
+    type: 10gbase-x-sfpp
+  - name: SFP+ 52
+    type: 10gbase-x-sfpp
+power-ports:
+  - name: AC Input
+    type: iec-60320-c14
+    maximum_draw: 100
+  - name: USP-RPS connector for PSU failover
+    type: ubiquiti-smartpower
+    maximum_draw: 100
diff --git a/device-types/Ubiquiti/UniFi-Dream-Machine-Pro-Max.yaml b/device-types/Ubiquiti/UniFi-Dream-Machine-Pro-Max.yaml
index a5e4dbfd8..effee47ed 100644
--- a/device-types/Ubiquiti/UniFi-Dream-Machine-Pro-Max.yaml
+++ b/device-types/Ubiquiti/UniFi-Dream-Machine-Pro-Max.yaml
@@ -5,15 +5,18 @@ slug: ubiquiti-unifi-dream-machine-pro-max
 airflow: front-to-rear
 part_number: UDM-PRO-MAX
 comments: |
-  [UniFi Dream Machine Pro](https://store.ui.com/products/udm-pro)
+  UniFi Dream Machine Pro Max
 
   Enterprise Security Gateway and Network Appliance with 10G SFP+, (8) 1G LAN, (1) 2.5G WAN, (1) 1/10G SFP+ LAN, (1) 1/10G SFP+ WAN
 
   Dimensions: 442.4 x 43.7 x 285.6 mm (17.42 x 1.72 x 11.24")
+  [UniFi Dream Machine Pro Max Techspecs](https://techspecs.ui.com/unifi/unifi-cloud-gateways/udm-pro-max)
 u_height: 1
 is_full_depth: false
 front_image: true
 rear_image: true
+weight: 10.4
+weight_unit: lb
 interfaces:
   - name: port.1
     type: 1000base-t
@@ -48,7 +51,9 @@ interfaces:
   - name: port.11
     type: 10gbase-x-sfpp
 power-ports:
-  - name: ps1
+  - name: Input
     type: iec-60320-c14
-    maximum_draw: 33
-    description: 100-240VAC/50-60 Hz
+    maximum_draw: 100
+  - name: USP-RPS connector for PSU failover
+    type: ubiquiti-smartpower
+    maximum_draw: 100
diff --git a/device-types/Ubiquiti/UniFi-Dream-Machine-Pro-Special-Edition.yaml b/device-types/Ubiquiti/UniFi-Dream-Machine-Pro-Special-Edition.yaml
index 0d8bd1ced..39a755b4a 100644
--- a/device-types/Ubiquiti/UniFi-Dream-Machine-Pro-Special-Edition.yaml
+++ b/device-types/Ubiquiti/UniFi-Dream-Machine-Pro-Special-Edition.yaml
@@ -2,16 +2,21 @@
 manufacturer: Ubiquiti
 model: UniFi Dream Machine Pro Special Edition
 slug: ubiquiti-unifi-dream-machine-pro-special-edition
-airflow: front-to-rear
 part_number: UDM-SE
+airflow: front-to-rear
 comments: |
-  [UniFi Dream Machine Pro Special Edition](https://store.ui.com/collections/unifi-network-unifi-os-consoles/products/dream-machine-se)
+  UniFi Dream Machine Pro Special Edition
 
   Enterprise Security Gateway and Network Appliance with 10G SFP+, (8) 1G PoE LAN, (1) 2.5G WAN, (1) 1/10G SFP+ LAN, (1) 1/10G SFP+ WAN
 
   Dimensions: 442.4 x 43.7 x 285.6 mm (17.42 x 1.72 x 11.24")
+  [UniFi Dream Machine Pro Special Edition Techspecs](https://techspecs.ui.com/unifi/unifi-cloud-gateways/udm-se)
 u_height: 1
 is_full_depth: false
+front_image: true
+rear_image: true
+weight: 10.9
+weight_unit: lb
 interfaces:
   - name: port.1
     type: 1000base-t
@@ -63,7 +68,9 @@ interfaces:
     type: 10gbase-x-sfpp
     label: Port 11 - SFP+ LAN
 power-ports:
-  - name: ps1
+  - name: Input
     type: iec-60320-c14
-    maximum_draw: 33
-    description: 100-240VAC/50-60 Hz
+    maximum_draw: 230
+  - name: USP-RPS connector for PSU failover
+    type: ubiquiti-smartpower
+    maximum_draw: 230
diff --git a/device-types/Ubiquiti/UniFi-Dream-Machine-Pro.yaml b/device-types/Ubiquiti/UniFi-Dream-Machine-Pro.yaml
index d5a16a6b7..0ff78e24a 100644
--- a/device-types/Ubiquiti/UniFi-Dream-Machine-Pro.yaml
+++ b/device-types/Ubiquiti/UniFi-Dream-Machine-Pro.yaml
@@ -3,17 +3,19 @@ manufacturer: Ubiquiti
 model: UniFi Dream Machine Pro
 slug: ubiquiti-unifi-dream-machine-pro
 airflow: front-to-rear
-part_number: UDM-Pro
 comments: |
-  [UniFi Dream Machine Pro](https://store.ui.com/products/udm-pro)
+  UniFi Dream Machine Pro
 
   Enterprise Security Gateway and Network Appliance with 10G SFP+, (8) 1G LAN, (1) 1G WAN, (1) 1/10G SFP+ LAN, (1) 1/10G SFP+ WAN
 
   Dimensions: 442.4 x 43.7 x 285.6 mm (17.42 x 1.72 x 11.24")
+  [UniFi Dream Machine Pro Techspecs](https://techspecs.ui.com/unifi/unifi-cloud-gateways/udm-pro)
 u_height: 1
 is_full_depth: false
 front_image: true
 rear_image: true
+weight: 8.6
+weight_unit: lb
 interfaces:
   - name: port.1
     type: 1000base-t
@@ -48,7 +50,9 @@ interfaces:
   - name: port.11
     type: 10gbase-x-sfpp
 power-ports:
-  - name: ps1
+  - name: Input
     type: iec-60320-c14
     maximum_draw: 33
-    description: 100-240VAC/50-60 Hz
+  - name: USP-RPS connector for PSU failover
+    type: ubiquiti-smartpower
+    maximum_draw: 33
diff --git a/elevation-images/Ubiquiti/ubiquiti-e7-audience-us.front.png b/elevation-images/Ubiquiti/ubiquiti-e7-audience-us.front.png
new file mode 100644
index 000000000..5b5e021b1
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-e7-audience-us.front.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-e7-campus-us.front.png b/elevation-images/Ubiquiti/ubiquiti-e7-campus-us.front.png
new file mode 100644
index 000000000..d9892d624
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-e7-campus-us.front.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-e7.front.png b/elevation-images/Ubiquiti/ubiquiti-e7.front.png
new file mode 100644
index 000000000..8c0b97c03
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-e7.front.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-enterprise-campus-aggregation.front.png b/elevation-images/Ubiquiti/ubiquiti-enterprise-campus-aggregation.front.png
new file mode 100644
index 000000000..8046453e1
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-enterprise-campus-aggregation.front.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-enterprise-campus-aggregation.rear.png b/elevation-images/Ubiquiti/ubiquiti-enterprise-campus-aggregation.rear.png
new file mode 100644
index 000000000..3037045db
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-enterprise-campus-aggregation.rear.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-enterprise-fortress-gateway.front.png b/elevation-images/Ubiquiti/ubiquiti-enterprise-fortress-gateway.front.png
new file mode 100644
index 000000000..2143236ef
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-enterprise-fortress-gateway.front.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-enterprise-fortress-gateway.rear.png b/elevation-images/Ubiquiti/ubiquiti-enterprise-fortress-gateway.rear.png
new file mode 100644
index 000000000..c9e21e9ab
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-enterprise-fortress-gateway.rear.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-enterprise-network-video-recorder.front.png b/elevation-images/Ubiquiti/ubiquiti-enterprise-network-video-recorder.front.png
new file mode 100644
index 000000000..6734aad48
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-enterprise-network-video-recorder.front.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-enterprise-network-video-recorder.rear.png b/elevation-images/Ubiquiti/ubiquiti-enterprise-network-video-recorder.rear.png
new file mode 100644
index 000000000..8aa5391f5
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-enterprise-network-video-recorder.rear.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-u7-outdoor.front-min.png b/elevation-images/Ubiquiti/ubiquiti-u7-outdoor.front-min.png
new file mode 100644
index 000000000..672bfc41e
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-u7-outdoor.front-min.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-u7-outdoor.front.png b/elevation-images/Ubiquiti/ubiquiti-u7-outdoor.front.png
new file mode 100644
index 000000000..672bfc41e
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-u7-outdoor.front.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-u7-pro-max.front-min.png b/elevation-images/Ubiquiti/ubiquiti-u7-pro-max.front-min.png
new file mode 100644
index 000000000..dd969d429
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-u7-pro-max.front-min.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-u7-pro-max.front.png b/elevation-images/Ubiquiti/ubiquiti-u7-pro-max.front.png
new file mode 100644
index 000000000..dd969d429
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-u7-pro-max.front.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-uacc-rack-panel-patch-blank-24.front.png b/elevation-images/Ubiquiti/ubiquiti-uacc-rack-panel-patch-blank-24.front.png
new file mode 100644
index 000000000..38eb5322b
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-uacc-rack-panel-patch-blank-24.front.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-uacc-rack-panel-patch-blank-24.rear.png b/elevation-images/Ubiquiti/ubiquiti-uacc-rack-panel-patch-blank-24.rear.png
new file mode 100644
index 000000000..99257fe4e
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-uacc-rack-panel-patch-blank-24.rear.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unas-pro.front.png b/elevation-images/Ubiquiti/ubiquiti-unas-pro.front.png
new file mode 100644
index 000000000..4731492e9
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unas-pro.front.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unas-pro.rear.png b/elevation-images/Ubiquiti/ubiquiti-unas-pro.rear.png
new file mode 100644
index 000000000..d13965c90
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unas-pro.rear.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-dream-machine-pro-special-edition.front.png b/elevation-images/Ubiquiti/ubiquiti-unifi-dream-machine-pro-special-edition.front.png
new file mode 100644
index 000000000..45586ad11
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-dream-machine-pro-special-edition.front.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-dream-machine-pro-special-edition.rear.png b/elevation-images/Ubiquiti/ubiquiti-unifi-dream-machine-pro-special-edition.rear.png
new file mode 100644
index 000000000..ba77d6ca8
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-dream-machine-pro-special-edition.rear.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-protect-network-video-recorder-pro.front.png b/elevation-images/Ubiquiti/ubiquiti-unifi-protect-network-video-recorder-pro.front.png
new file mode 100644
index 000000000..365d59ad8
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-protect-network-video-recorder-pro.front.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-protect-network-video-recorder-pro.rear.png b/elevation-images/Ubiquiti/ubiquiti-unifi-protect-network-video-recorder-pro.rear.png
new file mode 100644
index 000000000..56d0a54d2
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-protect-network-video-recorder-pro.rear.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-protect-network-video-recorder.front.png b/elevation-images/Ubiquiti/ubiquiti-unifi-protect-network-video-recorder.front.png
new file mode 100644
index 000000000..fe3a06759
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-protect-network-video-recorder.front.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-protect-network-video-recorder.rear.png b/elevation-images/Ubiquiti/ubiquiti-unifi-protect-network-video-recorder.rear.png
new file mode 100644
index 000000000..63feac31b
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-protect-network-video-recorder.rear.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-smartpower-rps.front.png b/elevation-images/Ubiquiti/ubiquiti-unifi-smartpower-rps.front.png
new file mode 100644
index 000000000..c5463abfe
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-smartpower-rps.front.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-smartpower-rps.rear.png b/elevation-images/Ubiquiti/ubiquiti-unifi-smartpower-rps.rear.png
new file mode 100644
index 000000000..5952cf342
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-smartpower-rps.rear.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-usw-pro-24.front.png b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-24-pro.front.png
similarity index 100%
rename from elevation-images/Ubiquiti/ubiquiti-usw-pro-24.front.png
rename to elevation-images/Ubiquiti/ubiquiti-unifi-switch-24-pro.front.png
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-switch-24-pro.rear.png b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-24-pro.rear.png
new file mode 100644
index 000000000..b45578c32
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-24-pro.rear.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-switch-48-pro-poe-gen2.front.png b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-48-pro-poe-gen2.front.png
new file mode 100644
index 000000000..e2b108db6
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-48-pro-poe-gen2.front.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-switch-48-pro-poe-gen2.rear.png b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-48-pro-poe-gen2.rear.png
new file mode 100644
index 000000000..02472b961
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-48-pro-poe-gen2.rear.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-switch-48-pro.front.png b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-48-pro.front.png
new file mode 100644
index 000000000..b6697baa1
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-48-pro.front.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-switch-48-pro.rear.png b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-48-pro.rear.png
new file mode 100644
index 000000000..7471ae7d6
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-48-pro.rear.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-switch-enterprise-24-poe.front.png b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-enterprise-24-poe.front.png
new file mode 100644
index 000000000..639ff6bb7
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-enterprise-24-poe.front.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-switch-enterprise-24-poe.rear.png b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-enterprise-24-poe.rear.png
new file mode 100644
index 000000000..33c3e2626
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-enterprise-24-poe.rear.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-switch-enterprise-48-poe.front.png b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-enterprise-48-poe.front.png
new file mode 100644
index 000000000..4e91a0568
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-enterprise-48-poe.front.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-switch-enterprise-48-poe.rear.png b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-enterprise-48-poe.rear.png
new file mode 100644
index 000000000..ccac9d26b
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-enterprise-48-poe.rear.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-aggregation.front.png b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-aggregation.front.png
new file mode 100644
index 000000000..472257279
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-aggregation.front.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-aggregation.rear.png b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-aggregation.rear.png
new file mode 100644
index 000000000..dc18e8570
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-aggregation.rear.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-max-24-poe.front.png b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-max-24-poe.front.png
new file mode 100644
index 000000000..8a15e7b8c
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-max-24-poe.front.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-max-24-poe.rear.png b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-max-24-poe.rear.png
new file mode 100644
index 000000000..95f551b43
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-max-24-poe.rear.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-max-24.front.png b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-max-24.front.png
new file mode 100644
index 000000000..b8beff005
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-max-24.front.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-max-24.rear.png b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-max-24.rear.png
new file mode 100644
index 000000000..1253e2b53
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-max-24.rear.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-max-48-poe.front.png b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-max-48-poe.front.png
new file mode 100644
index 000000000..760597d3d
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-max-48-poe.front.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-max-48-poe.rear.png b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-max-48-poe.rear.png
new file mode 100644
index 000000000..ea9cf720b
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-max-48-poe.rear.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-max-48.front.png b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-max-48.front.png
new file mode 100644
index 000000000..25728eee7
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-max-48.front.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-max-48.rear.png b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-max-48.rear.png
new file mode 100644
index 000000000..051d2c2b7
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-max-48.rear.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unvr-pro.front.png b/elevation-images/Ubiquiti/ubiquiti-unvr-pro.front.png
deleted file mode 100644
index c02653993..000000000
Binary files a/elevation-images/Ubiquiti/ubiquiti-unvr-pro.front.png and /dev/null differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-usp-pdu-hd.front.png b/elevation-images/Ubiquiti/ubiquiti-usp-pdu-hd.front.png
new file mode 100644
index 000000000..162891d8d
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-usp-pdu-hd.front.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-usp-pdu-hd.rear.png b/elevation-images/Ubiquiti/ubiquiti-usp-pdu-hd.rear.png
new file mode 100644
index 000000000..18415d2fe
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-usp-pdu-hd.rear.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-usp-pdu-pro.front.png b/elevation-images/Ubiquiti/ubiquiti-usp-pdu-pro.front.png
new file mode 100644
index 000000000..e94cf50e2
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-usp-pdu-pro.front.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-usp-pdu-pro.rear.png b/elevation-images/Ubiquiti/ubiquiti-usp-pdu-pro.rear.png
new file mode 100644
index 000000000..1a74bf828
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-usp-pdu-pro.rear.png differ
diff --git a/module-types/Ubiquiti/UACC-PSU-12V-150W.yaml b/module-types/Ubiquiti/UACC-PSU-12V-150W.yaml
new file mode 100644
index 000000000..584285ac0
--- /dev/null
+++ b/module-types/Ubiquiti/UACC-PSU-12V-150W.yaml
@@ -0,0 +1,9 @@
+---
+manufacturer: Ubiquiti
+model: UACC-PSU-12V-150W
+part_number: UACC-PSU-12V-150W
+comments: '[Ubiquiti PSU-150W](https://techspecs.ui.com/unifi/accessories/uacc-psu-12v-150w) Data Sheet'
+power-ports:
+  - name: PSU {module}
+    type: iec-60320-c14
+    maximum_draw: 150
diff --git a/module-types/Ubiquiti/UACC-PSU-12V-550W.yaml b/module-types/Ubiquiti/UACC-PSU-12V-550W.yaml
new file mode 100644
index 000000000..658e40f11
--- /dev/null
+++ b/module-types/Ubiquiti/UACC-PSU-12V-550W.yaml
@@ -0,0 +1,9 @@
+---
+manufacturer: Ubiquiti
+model: UACC-PSU-12V-550W
+part_number: UACC-PSU-12V-550W
+comments: '[Ubiquiti PSU-550W](https://techspecs.ui.com/unifi/accessories/uacc-psu-12v-550w) Data Sheet'
+power-ports:
+  - name: PSU {module}
+    type: iec-60320-c14
+    maximum_draw: 550