diff --git a/device-types/Ubiquiti/EP-R6.yaml b/device-types/Ubiquiti/EP-R6.yaml
new file mode 100644
index 000000000..e87d32a5f
--- /dev/null
+++ b/device-types/Ubiquiti/EP-R6.yaml
@@ -0,0 +1,34 @@
+---
+manufacturer: Ubiquiti
+model: EdgePoint Router 6-Port
+slug: edgepoint-router-6-port
+part_number: EP-R6
+comments: '[EdgePoint Router 6-Port](https://www.ui.com/downloads/datasheets/edgemax/EdgePoint_DS.pdf)'
+u_height: 0
+is_full_depth: false
+power-ports:
+  - name: 24VDC
+    type: dc-terminal
+    maximum_draw: 72
+interfaces:
+  - name: eth0
+    type: 1000base-t
+    mgmt_only: false
+  - name: eth1
+    type: 1000base-t
+    mgmt_only: false
+  - name: eth2
+    type: 1000base-t
+    mgmt_only: false
+  - name: eth3
+    type: 1000base-t
+    mgmt_only: false
+  - name: eth4
+    type: 1000base-t
+    mgmt_only: false
+  - name: eth5
+    type: 1000base-x-sfp
+    mgmt_only: false
+  - name: switch0
+    type: bridge
+    mgmt_only: false
diff --git a/device-types/Ubiquiti/EP-R8.yaml b/device-types/Ubiquiti/EP-R8.yaml
new file mode 100644
index 000000000..8dbe87b4a
--- /dev/null
+++ b/device-types/Ubiquiti/EP-R8.yaml
@@ -0,0 +1,46 @@
+---
+manufacturer: Ubiquiti
+model: EdgePoint Router 8-Port
+slug: edgepoint-router-8-port
+part_number: EP-R8
+comments: '[EdgePoint Router 8-Port](https://www.ui.com/downloads/datasheets/edgemax/EdgePoint_DS.pdf)'
+u_height: 0
+is_full_depth: false
+power-ports:
+  - name: 54VDC
+    type: dc-terminal
+    maximum_draw: 324
+interfaces:
+  - name: eth0
+    type: 1000base-t
+    mgmt_only: false
+  - name: eth1
+    type: 1000base-t
+    mgmt_only: false
+  - name: eth2
+    type: 1000base-t
+    mgmt_only: false
+  - name: eth3
+    type: 1000base-t
+    mgmt_only: false
+  - name: eth4
+    type: 1000base-t
+    mgmt_only: false
+  - name: eth5
+    type: 1000base-t
+    mgmt_only: false
+  - name: eth6
+    type: 1000base-t
+    mgmt_only: false
+  - name: eth7
+    type: 1000base-t
+    mgmt_only: false
+  - name: eth8
+    type: 1000base-x-sfp
+    mgmt_only: false
+  - name: eth9
+    type: 1000base-x-sfp
+    mgmt_only: false
+  - name: switch0
+    type: bridge
+    mgmt_only: false