diff --git a/device-types/Watchguard/Firebox-M370.yaml b/device-types/Watchguard/Firebox-M370.yaml
new file mode 100644
index 000000000..96ec2ee47
--- /dev/null
+++ b/device-types/Watchguard/Firebox-M370.yaml
@@ -0,0 +1,35 @@
+---
+manufacturer: Watchguard
+model: Firebox M370
+slug: watchguard-firebox-m370
+u_height: 1.0
+is_full_depth: false
+airflow: front-to-rear
+comments: '[Firebox M370, M470, M570 and M670 Hardware Guide](https://www.watchguard.com/help/docs/hardware%20guides/Firebox_M370_470_570_670_Hardware_Guide.pdf)'
+weight: 5
+weight_unit: kg
+console-ports:
+  - name: console
+    type: rj-45
+power-ports:
+  - name: PSU
+    type: iec-60320-c14
+    maximum_draw: 220
+    allocated_draw: 220
+interfaces:
+  - name: eth0
+    type: 1000base-t
+  - name: eth1
+    type: 1000base-t
+  - name: eth2
+    type: 1000base-t
+  - name: eth3
+    type: 1000base-t
+  - name: eth4
+    type: 1000base-t
+  - name: eth5
+    type: 1000base-t
+  - name: eth6
+    type: 1000base-t
+  - name: eth7
+    type: 1000base-t
diff --git a/device-types/Watchguard/Firebox-T80.yaml b/device-types/Watchguard/Firebox-T80.yaml
new file mode 100644
index 000000000..ee24bae15
--- /dev/null
+++ b/device-types/Watchguard/Firebox-T80.yaml
@@ -0,0 +1,37 @@
+---
+manufacturer: Watchguard
+model: Firebox T80
+slug: watchguard-firebox-t80
+u_height: 1.0
+is_full_depth: false
+airflow: left-to-right
+comments: '[Watchguard Firebox T80 Hardware Guide](https://www.watchguard.com/help/docs/help-center/en-US/Content/en-US/Hardware-Guides/firebox-t80-hardware-guide.html)'
+weight: 2.6
+weight_unit: kg
+console-ports:
+  - name: mgmnt
+    type: rj-45
+power-ports:
+  - name: PSU0
+    type: dc-terminal
+interfaces:
+  - name: eth0
+    type: 1000base-t
+  - name: eth1
+    type: 1000base-t
+  - name: eth2
+    type: 1000base-t
+  - name: eth3
+    type: 1000base-t
+  - name: eth4
+    type: 1000base-t
+  - name: eth5
+    type: 1000base-t
+  - name: eth6
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: eth7
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at