diff --git a/device-types/ADVA/FSP-150-CM.yaml b/device-types/ADVA/FSP-150-CM.yaml
new file mode 100644
index 000000000..23e4a5e9e
--- /dev/null
+++ b/device-types/ADVA/FSP-150-CM.yaml
@@ -0,0 +1,58 @@
+---
+manufacturer: ADVA
+model: FSP-150-CM
+slug: adva-fsp-150-cm
+part_number: '1044004001'
+u_height: 4
+is_full_depth: false
+console-ports:
+  - name: rs-232
+    type: rj-45
+interfaces:
+  - name: BITSI/O
+    type: 1000base-t
+    mgmt_only: true
+  - name: SER
+    type: 1000base-t
+    mgmt_only: true
+  - name: DCN1
+    type: 10gbase-x-sfpp
+  - name: DCN2
+    type: 10gbase-x-sfpp
+module-bays:
+  - name: PSU1
+    position: PSU1
+  - name: PSU2
+    position: PSU2
+  - name: Slot 1
+    position: '1'
+  - name: Slot 2
+    position: '2'
+  - name: Slot 3
+    position: '3'
+  - name: Slot 4
+    position: '4'
+  - name: Slot 5
+    position: '5'
+  - name: Slot 6
+    position: '6'
+  - name: Slot 7
+    position: '7'
+  - name: Slot 8
+    position: '8'
+  - name: Slot 9
+    position: '9'
+  - name: Slot 10
+    position: '10'
+  - name: Slot 11
+    position: '11'
+  - name: Slot 12
+    position: '12'
+  - name: Slot 13
+    position: '13'
+  - name: Slot 14
+    position: '14'
+  - name: Slot 15
+    position: '15'
+  - name: Slot 16
+    position: '16'
diff --git a/module-types/ADVA/FSP-150-CM-PSU.yaml b/module-types/ADVA/FSP-150-CM-PSU.yaml
new file mode 100644
index 000000000..432e8ed4e
--- /dev/null
+++ b/module-types/ADVA/FSP-150-CM-PSU.yaml
@@ -0,0 +1,8 @@
+---
+manufacturer: ADVA
+model: FSP-150-CM-PSU
+part_number: FSP-150-CM-PSU
+power-ports:
+  - name: Power Supply {module}
+    type: iec-60320-c14
+    maximum_draw: 100
diff --git a/module-types/ADVA/NEMI.yaml b/module-types/ADVA/NEMI.yaml
new file mode 100644
index 000000000..e9062dc85
--- /dev/null
+++ b/module-types/ADVA/NEMI.yaml
@@ -0,0 +1,10 @@
+---
+manufacturer: ADVA
+model: NEMI
+part_number: 1044200020-05
+console-ports:
+  - name: SER
+    type: rj-45
+interfaces:
+  - name: DCN-{module}/1
+    type: 10gbase-x-sfpp
diff --git a/module-types/ADVA/NTU-GE.yaml b/module-types/ADVA/NTU-GE.yaml
new file mode 100644
index 000000000..844aecda4
--- /dev/null
+++ b/module-types/ADVA/NTU-GE.yaml
@@ -0,0 +1,13 @@
+---
+manufacturer: ADVA
+model: NTU-GE
+part_number: '1044441001'
+interfaces:
+  - name: NET-{module}/1
+    type: 1000base-x-sfp
+  - name: NET-{module}/2
+    type: 1000base-x-sfp
+  - name: ACC-{module}/1
+    type: 1000base-x-sfp
+  - name: ACC-{module}/2
+    type: 1000base-t