diff --git a/device-types/MikroTik/RB1200.yaml b/device-types/MikroTik/RB1200.yaml
new file mode 100644
index 000000000..573722e0d
--- /dev/null
+++ b/device-types/MikroTik/RB1200.yaml
@@ -0,0 +1,39 @@
+---
+manufacturer: MikroTik
+model: RB1200
+slug: mikrotik-RB1200
+part_number: 'RB1200'
+u_height: 0
+weight: 0.37
+weight_unit: kg
+is_full_depth: false
+airflow: passive
+comments: '[RB1200 Datasheet](https://mikrotik.com/product/RB1200)'
+power-ports:
+  - name: Power
+    type: iec-60320-c14
+    maximum_draw: 23
+console-ports:
+  - name: Serial
+    type: de-9
+interfaces:
+  - name: ether1
+    type: 1000base-t
+  - name: ether2
+    type: 1000base-t
+  - name: ether3
+    type: 1000base-t
+  - name: ether4
+    type: 1000base-t
+  - name: ether5
+    type: 1000base-t
+  - name: ether6
+    type: 1000base-t
+  - name: ether7
+    type: 1000base-t
+  - name: ether8
+    type: 1000base-t
+  - name: ether9
+    type: 1000base-t
+  - name: ether10
+    type: 1000base-t
diff --git a/device-types/MikroTik/RB2011iL-IN.yaml b/device-types/MikroTik/RB2011iL-IN.yaml
index 3c8cbfad4..1ca3a578c 100644
--- a/device-types/MikroTik/RB2011iL-IN.yaml
+++ b/device-types/MikroTik/RB2011iL-IN.yaml
@@ -1,10 +1,26 @@
 ---
 manufacturer: MikroTik
 model: RB2011iL-IN
-slug: rb2011il-in
+slug: mikrotik-rb2011il-in
+part_number: 'RB2011iL-IN'
+u_height: 0
+weight: 0.15
+weight_unit: kg
+is_full_depth: false
+airflow: passive
+comments: '[RB2011iL-IN Datasheet](https://mikrotik.com/product/RB2011iL-IN)'
+power-ports:
+  - name: Power
+    type: dc-terminal
+    maximum_draw: 24
+    allocated_draw: 7
+    description: DC 8-30 V - 500 mA
 interfaces:
   - name: ether1
     type: 1000base-t
+    poe_mode: pd
+    poe_type: passive-24v-2pair
+    description: POE-IN
   - name: ether2
     type: 1000base-t
   - name: ether3
@@ -23,3 +39,6 @@ interfaces:
     type: 100base-tx
   - name: ether10
     type: 100base-tx
+    poe_mode: pd
+    poe_type: passive-24v-2pair
+    description: POE-OUT
diff --git a/device-types/MikroTik/RB4011iGS+RM.yaml b/device-types/MikroTik/RB4011iGS+RM.yaml
index 02abe298e..8c016c3b2 100644
--- a/device-types/MikroTik/RB4011iGS+RM.yaml
+++ b/device-types/MikroTik/RB4011iGS+RM.yaml
@@ -1,12 +1,27 @@
 ---
 manufacturer: MikroTik
 model: RB4011iGS+RM
-slug: rb4011igs1splusrm
+slug: mikrotik-rb4011igs-plus-rm
+part_number: 'RB4011iGS+RM'
 is_full_depth: false
 u_height: 1
+comments: '[RB4011iGS+RM Datasheet](https://mikrotik.com/product/rb4011igs_rm)'
+power-ports:
+  - name: Power
+    label: DC 18-57V
+    type: dc-terminal
+    maximum_draw: 33
+    allocated_draw: 18
+console-ports:
+  - name: Serial
+    label: CONSOLE
+    type: rj-45
 interfaces:
   - name: ether1
     type: 1000base-t
+    poe_mode: pd
+    poe_type: type1-ieee802.3af
+    description: POE-IN
   - name: ether2
     type: 1000base-t
   - name: ether3
@@ -25,5 +40,8 @@ interfaces:
     type: 1000base-t
   - name: ether10
     type: 1000base-t
+    poe_mode: pd
+    poe_type: passive-48v-2pair
+    description: POE-OUT
   - name: sfp-sfpplus1
     type: 10gbase-x-sfpp
diff --git a/device-types/MikroTik/RB941-2nD-TC.yaml b/device-types/MikroTik/RB941-2nD-TC.yaml
new file mode 100644
index 000000000..43f222500
--- /dev/null
+++ b/device-types/MikroTik/RB941-2nD-TC.yaml
@@ -0,0 +1,26 @@
+---
+manufacturer: MikroTik
+model: hAP lite TC
+slug: mikrotik-hap-lite-tc
+part_number: 'RB941-2nD-TC'
+u_height: 0
+weight: 0.35
+weight_unit: kg
+is_full_depth: false
+airflow: passive
+comments: '[RB941-2nD-TC Datasheet](https://mikrotik.com/product/RB941-2nD-TC)'
+power-ports:
+  - name: Power
+    type: usb-micro-b
+    maximum_draw: 3
+interfaces:
+  - name: Ether1
+    type: 100base-tx
+  - name: Ether2
+    type: 100base-tx
+  - name: Ether3
+    type: 100base-tx
+  - name: Ether4
+    type: 100base-tx
+  - name: Wireless 2.4 GHz
+    type: ieee802.11g
diff --git a/device-types/Zyxel/FMG3005-R20A.yaml b/device-types/Zyxel/FMG3005-R20A.yaml
new file mode 100644
index 000000000..9393beca7
--- /dev/null
+++ b/device-types/Zyxel/FMG3005-R20A.yaml
@@ -0,0 +1,23 @@
+---
+manufacturer: Zyxel
+model: FMG3005-R20A
+slug: zyxel-fmg3005-r20a
+part_number: 'FMG3005-R20A'
+u_height: 0
+weight: 150
+weight_unit: g
+is_full_depth: false
+airflow: passive
+comments: '[FMG3005-R20A series specs](https://service-provider.zyxel.com/global/en/products/fiber-oltsonts/active-fiber/sfus/fmg3005-r20a) factory default settings (LAN IP address 192.168.1.1, user name2admin and password 1234)'
+power-ports:
+  - name: Power
+    type: dc-terminal
+    maximum_draw: 12
+    description: 12 V DC, 0.5 A
+interfaces:
+  - name: PON
+    label: PON
+    type: gpon
+  - name: LAN
+    label: LAN
+    type: 1000base-t