diff --git a/device-types/Netgate/1100-Security-Gateway.yaml b/device-types/Netgate/1100-Security-Gateway.yaml
new file mode 100644
index 000000000..eb10ba290
--- /dev/null
+++ b/device-types/Netgate/1100-Security-Gateway.yaml
@@ -0,0 +1,26 @@
+---
+manufacturer: Netgate
+model: 1100 Security Gateway
+slug: netgate-1100-security-gateway
+u_height: 1
+weight: 0.45
+weight_unit: kg
+is_full_depth: false
+airflow: front-to-rear
+console-ports:
+  - name: console-usb
+    type: usb-micro-b
+    description: 115200 baud rate, 8 data bits, no parity, 1 stop bit, no flow control or XON/OFF
+power-ports:
+  - name: psu1
+    type: dc-terminal
+interfaces:
+  - name: mvneta0.4090
+    type: 1000base-t
+    label: WAN
+  - name: mvneta0.4091
+    type: 1000base-t
+    label: LAN
+  - name: mvneta0.4092
+    type: 1000base-t
+    label: OPT
diff --git a/device-types/Netgate/6100-Security-Gateway.yaml b/device-types/Netgate/6100-Security-Gateway.yaml
new file mode 100644
index 000000000..f2c79b39a
--- /dev/null
+++ b/device-types/Netgate/6100-Security-Gateway.yaml
@@ -0,0 +1,50 @@
+---
+manufacturer: Netgate
+model: 6100 Security Gateway
+slug: netgate-6100-security-gateway
+u_height: 1
+weight: 1.9
+weight_unit: kg
+is_full_depth: false
+airflow: front-to-rear
+console-ports:
+  - name: console-usb
+    type: usb-micro-b
+    description: |
+      Auto-detect console port: use RJ-45 -OR- micro-USB.
+      115200 baud rate, 8 data bits, no parity, 1 stop bit, no flow control
+      or XON/OFF
+  - name: console-rj45
+    type: rj-45
+    description: |
+      Auto-detect console port: use RJ-45 -OR- micro-USB.
+      115200 baud rate, 8 data bits, no parity, 1 stop bit, no flow control
+      or XON/OFF
+power-ports:
+  - name: psu1
+    type: dc-terminal
+interfaces:
+  - name: ix3
+    type: 1000base-x-sfp
+    label: WAN1
+  - name: ix2
+    type: 1000base-x-sfp
+    label: WAN2
+  - name: ix0
+    type: 10gbase-x-sfpp
+    label: WAN3
+  - name: ix1
+    type: 10gbase-x-sfpp
+    label: WAN4
+  - name: igc0
+    type: 2.5gbase-t
+    label: LAN1
+  - name: igc1
+    type: 2.5gbase-t
+    label: LAN2
+  - name: igc2
+    type: 2.5gbase-t
+    label: LAN3
+  - name: igc3
+    type: 2.5gbase-t
+    label: LAN4
diff --git a/device-types/Netgate/8200-max-pfsense-plus--security-gateway.yaml b/device-types/Netgate/8200-max-pfsense-plus--security-gateway.yaml
index 00195dace..71fbdde8a 100644
--- a/device-types/Netgate/8200-max-pfsense-plus--security-gateway.yaml
+++ b/device-types/Netgate/8200-max-pfsense-plus--security-gateway.yaml
@@ -5,11 +5,6 @@ slug: netgate-8200-max-pfsense-plus-security-gateway
 u_height: 1
 is_full_depth: false
 airflow: front-to-rear
-console-server-ports:
-  - name: usb1
-    type: usb-a
-  - name: usb2
-    type: usb-a
 console-ports:
   - name: console-usb
     type: usb-micro-b
diff --git a/device-types/Netgate/8300-Security-Gateway.yaml b/device-types/Netgate/8300-Security-Gateway.yaml
new file mode 100644
index 000000000..fa7915a7c
--- /dev/null
+++ b/device-types/Netgate/8300-Security-Gateway.yaml
@@ -0,0 +1,50 @@
+---
+manufacturer: Netgate
+model: 8300 Security Gateway
+slug: netgate-8300-security-gateway
+u_height: 1
+weight: 6.05
+weight_unit: kg
+is_full_depth: false
+airflow: front-to-rear
+console-ports:
+  - name: console-rj45
+    type: rj-45
+    description: 115200 baud rate, 8 data bits, no parity, 1 stop bit, no flow control or XON/OFF
+power-ports:
+  - name: psu1
+    type: iec-60320-c16
+interfaces:
+  - name: ice0
+    type: 10gbase-x-sfpp
+    label: P0
+  - name: ice1
+    type: 10gbase-x-sfpp
+    label: P1
+  - name: ice2
+    type: 10gbase-x-sfpp
+    label: P2
+  - name: ice3
+    type: 10gbase-x-sfpp
+    label: P3
+  - name: ice4
+    type: 1000base-x-sfp
+    label: P4
+  - name: ice5
+    type: 1000base-x-sfp
+    label: P5
+  - name: ice6
+    type: 1000base-x-sfp
+    label: P5
+  - name: ice7
+    type: 1000base-x-sfp
+    label: P6
+  - name: igc2
+    type: 2.5gbase-t
+    label: P7
+  - name: igc1
+    type: 2.5gbase-t
+    label: P8
+  - name: igc0
+    type: 2.5gbase-t
+    label: P7