diff --git a/device-types/FS/FHZ-1UFSP.yaml b/device-types/FS/FHZ-1UFSP.yaml
new file mode 100644
index 0000000000..e777856dad
--- /dev/null
+++ b/device-types/FS/FHZ-1UFSP.yaml
@@ -0,0 +1,33 @@
+---
+manufacturer: FS
+model: FHZ-1UFSP
+slug: fs-fhz-1ufsp
+comments: 1U 216 Fibers Rack Mount FHZ Ultra HD Fiber Enclosure Unloaded, Holds up to 12x FHZ MTP-12 Cassettes or Panels
+part_number: FHZ-1UFSP (#74183)
+u_height: 1
+is_full_depth: true
+module-bays:
+  - name: '1'
+    position: '1'
+  - name: '2'
+    position: '2'
+  - name: '3'
+    position: '3'
+  - name: '4'
+    position: '4'
+  - name: '5'
+    position: '5'
+  - name: '6'
+    position: '6'
+  - name: '7'
+    position: '7'
+  - name: '8'
+    position: '8'
+  - name: '9'
+    position: '9'
+  - name: '10'
+    position: '10'
+  - name: '11'
+    position: '11'
+  - name: '12'
+    position: '12'
diff --git a/module-types/FS/FHZ-36F3MTPLCOM4.yaml b/module-types/FS/FHZ-36F3MTPLCOM4.yaml
new file mode 100644
index 0000000000..d2dd289268
--- /dev/null
+++ b/module-types/FS/FHZ-36F3MTPLCOM4.yaml
@@ -0,0 +1,106 @@
+---
+manufacturer: FS
+model: FHZ-36F3MTPLCOM4
+part_number: '74184'
+comments: FHZ MTP-LC Cassette, OM4 Multimode, Type AF, 36 Fibers, 3x MTP-12
+front-ports:
+  - name: '{module}:1-12'
+    type: lc
+    rear_port: '{module}:1-12'
+    rear_port_position: 1
+    color: 00ffff
+  - name: '{module}:2-11'
+    type: lc
+    rear_port: '{module}:1-12'
+    rear_port_position: 2
+    color: 00ffff
+  - name: '{module}:3-10'
+    type: lc
+    rear_port: '{module}:1-12'
+    rear_port_position: 3
+    color: 00ffff
+  - name: '{module}:4-9'
+    type: lc
+    rear_port: '{module}:1-12'
+    rear_port_position: 4
+    color: 00ffff
+  - name: '{module}:5-8'
+    type: lc
+    rear_port: '{module}:1-12'
+    rear_port_position: 5
+    color: 00ffff
+  - name: '{module}:6-7'
+    type: lc
+    rear_port: '{module}:1-12'
+    rear_port_position: 6
+    color: 00ffff
+  - name: '{module}:13-24'
+    type: lc
+    rear_port: '{module}:13-24'
+    rear_port_position: 1
+    color: 00ffff
+  - name: '{module}:14-23'
+    type: lc
+    rear_port: '{module}:13-24'
+    rear_port_position: 2
+    color: 00ffff
+  - name: '{module}:15-22'
+    type: lc
+    rear_port: '{module}:13-24'
+    rear_port_position: 3
+    color: 00ffff
+  - name: '{module}:16-21'
+    type: lc
+    rear_port: '{module}:13-24'
+    rear_port_position: 4
+    color: 00ffff
+  - name: '{module}:17-20'
+    type: lc
+    rear_port: '{module}:13-24'
+    rear_port_position: 5
+    color: 00ffff
+  - name: '{module}:18-19'
+    type: lc
+    rear_port: '{module}:13-24'
+    rear_port_position: 6
+    color: 00ffff
+  - name: '{module}:25-36'
+    type: lc
+    rear_port: '{module}:25-36'
+    rear_port_position: 1
+    color: 00ffff
+  - name: '{module}:26-35'
+    type: lc
+    rear_port: '{module}:25-36'
+    rear_port_position: 2
+    color: 00ffff
+  - name: '{module}:27-34'
+    type: lc
+    rear_port: '{module}:25-36'
+    rear_port_position: 3
+    color: 00ffff
+  - name: '{module}:28-33'
+    type: lc
+    rear_port: '{module}:25-36'
+    rear_port_position: 4
+    color: 00ffff
+  - name: '{module}:29-32'
+    type: lc
+    rear_port: '{module}:25-36'
+    rear_port_position: 5
+    color: 00ffff
+  - name: '{module}:30-31'
+    type: lc
+    rear_port: '{module}:25-36'
+    rear_port_position: 6
+    color: 00ffff
+rear-ports:
+  - name: '{module}:1-12'
+    type: mpo
+    positions: 6
+  - name: '{module}:13-24'
+    type: mpo
+    positions: 6
+  - name: '{module}:25-36'
+    type: mpo
+    positions: 6