diff --git a/device-types/Ubiquiti/U7-Pro-XG.yaml b/device-types/Ubiquiti/U7-Pro-XG.yaml
new file mode 100644
index 000000000..6901dbbef
--- /dev/null
+++ b/device-types/Ubiquiti/U7-Pro-XG.yaml
@@ -0,0 +1,52 @@
+---
+manufacturer: Ubiquiti
+model: U7 Pro XG
+part_number: U7-Pro-XG
+slug: ubiquiti-u7-pro-xg
+u_height: 0
+is_full_depth: false
+airflow: passive
+weight: 750
+weight_unit: g
+interfaces:
+  - name: Port 1
+    type: 10gbase-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: 4.3 Gbps (BW240), MIMO: 2x2 (DL/UL MU-MIMO), Max TX Power: 26 dBm, Antenna Gain: 5 dBi
+  - name: WLAN 2
+    type: ieee802.11ax
+    label: 6 GHz (WiFi 6E)
+    description: |
+      Max Data Rate: 5.8 Gbps (BW320), MIMO: 2x2 (DL/UL MU-MIMO), Max TX Power: 24 dBm, Antenna Gain: 6 dBi
+  - name: WLAN 3
+    type: ieee802.11be
+    label: 5 GHz (WiFi 7)
+    description: |
+      Max Data Rate: 4.3 Gbps (BW240), MIMO: 2x2 (DL/UL MU-MIMO), Max TX Power: 26 dBm, Antenna Gain: 5 dBi
+  - name: WLAN 4
+    type: ieee802.11be
+    label: 6 GHz (WiFi 7)
+    description: |
+      Max Data Rate: 5.8 Gbps (BW320), MIMO: 2x2 (DL/UL MU-MIMO), Max TX Power: 24 dBm, Antenna Gain: 6 dBi
+front_image: true
+rear_image: true
+comments: |
+  [U7 Pro XG](https://techspecs.ui.com/unifi/wifi/u7-pro-xg)
+
+  Ceiling-mounted 6-stream WiFi 7 AP with 10/5/2.5/1 GbE support.
+
+  Dimensions: diameter 206 x 32.5 mm (diameter 8.1 x 1.3")
+  Max. Power Consumption: 22W
+  Weight: 750 g (1.7 lb)
+  Certifications: CE, FCC, IC
diff --git a/device-types/Ubiquiti/U7-Pro-XGS.yaml b/device-types/Ubiquiti/U7-Pro-XGS.yaml
new file mode 100644
index 000000000..6f29bfed7
--- /dev/null
+++ b/device-types/Ubiquiti/U7-Pro-XGS.yaml
@@ -0,0 +1,52 @@
+---
+manufacturer: Ubiquiti
+model: U7 Pro XGS
+part_number: U7-Pro-XGS
+slug: ubiquiti-u7-pro-xgs
+u_height: 0
+is_full_depth: false
+airflow: passive
+weight: 800
+weight_unit: g
+interfaces:
+  - name: Port 1
+    type: 10gbase-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: 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.8 Gbps (BW320), MIMO: 2x2 (DL/UL MU-MIMO), Max TX Power: 24 dBm, Antenna Gain: 6 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.8 Gbps (BW320), MIMO: 2x2 (DL/UL MU-MIMO), Max TX Power: 24 dBm, Antenna Gain: 6 dBi
+front_image: true
+rear_image: true
+comments: |
+  [U7 Pro XGS](https://techspecs.ui.com/unifi/wifi/u7-pro-xgs)
+
+  Ceiling-mounted 8-stream WiFi 7 AP with dedicated spectral scanning radio and 10/5/2.5/1 GbE support.
+
+  Dimensions: diameter 215 x 32.5 mm (diameter 8.5 x 1.3")
+  Max. Power Consumption: 29W
+  Weight: 800 g (1.8 lb)
+  Certifications: CE, FCC, IC
diff --git a/elevation-images/Ubiquiti/ubiquiti-u7-pro-xg.front.png b/elevation-images/Ubiquiti/ubiquiti-u7-pro-xg.front.png
new file mode 100755
index 000000000..577ee8950
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-u7-pro-xg.front.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-u7-pro-xg.rear.png b/elevation-images/Ubiquiti/ubiquiti-u7-pro-xg.rear.png
new file mode 100755
index 000000000..3d59ab5d6
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-u7-pro-xg.rear.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-u7-pro-xgs.front.png b/elevation-images/Ubiquiti/ubiquiti-u7-pro-xgs.front.png
new file mode 100755
index 000000000..467530bd6
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-u7-pro-xgs.front.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-u7-pro-xgs.rear.png b/elevation-images/Ubiquiti/ubiquiti-u7-pro-xgs.rear.png
new file mode 100755
index 000000000..300ef6aa8
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-u7-pro-xgs.rear.png differ