diff --git a/device-types/HPE/Nimble-HF40-Controller.yaml b/device-types/HPE/Nimble-HF40-Controller.yaml
new file mode 100644
index 000000000..516ba3702
--- /dev/null
+++ b/device-types/HPE/Nimble-HF40-Controller.yaml
@@ -0,0 +1,23 @@
+---
+manufacturer: HPE
+model: Nimble HF40 Controller
+slug: hpe-nimble-hf40-controller
+part_number: Q8H68A
+subdevice_role: child
+u_height: 0
+console-ports:
+  - name: Serial
+    type: other
+    description: 3.5mm
+interfaces:
+  - name: eth0a
+    type: 10gbase-t
+  - name: eth0b
+    type: 10gbase-t
+module-bays:
+  - name: NIC1
+    position: '1'
+  - name: NIC2
+    position: '2'
+  - name: NIC3
+    position: '3'
diff --git a/device-types/HPE/Nimble-HF40.yaml b/device-types/HPE/Nimble-HF40.yaml
new file mode 100644
index 000000000..05e7c2503
--- /dev/null
+++ b/device-types/HPE/Nimble-HF40.yaml
@@ -0,0 +1,24 @@
+---
+manufacturer: HPE
+model: Nimble-HF40
+slug: hpe-nimble-hf40
+u_height: 4
+is_full_depth: true
+airflow: front-to-rear
+part_number: Q8H39A
+comments: HPE Nimble Storage HF40 Adaptive Dual Controller 10GBASE-T 2-port Configure-to-order Base Array
+weight: 65
+weight_unit: kg
+subdevice_role: parent
+module-bays:
+  - name: PSU1
+    position: PSU1
+  - name: PSU2
+    position: PSU2
+device-bays:
+  - name: A
+    label: Controller A
+    position: A
+  - name: B
+    label: Controller B
+    position: B
diff --git a/module-types/HPE/Q8B84B.yaml b/module-types/HPE/Q8B84B.yaml
new file mode 100644
index 000000000..36ebc4b11
--- /dev/null
+++ b/module-types/HPE/Q8B84B.yaml
@@ -0,0 +1,9 @@
+---
+manufacturer: HPE
+model: HPE Nimble Storage 2x1GbE 2-port FIO Adapter Kit
+part_number: Q8B84B
+interfaces:
+  - name: eth{module}a
+    type: 1000base-t
+  - name: eth{module}b
+    type: 1000base-t
diff --git a/module-types/HPE/Q8B88B.yaml b/module-types/HPE/Q8B88B.yaml
new file mode 100644
index 000000000..e0db40a16
--- /dev/null
+++ b/module-types/HPE/Q8B88B.yaml
@@ -0,0 +1,9 @@
+---
+manufacturer: HPE
+model: HPE Nimble Storage 2x10GbE 2-port FIO Adapter Kit
+part_number: Q8B88B
+interfaces:
+  - name: eth{module}a
+    type: 10gbase-x-sfpp
+  - name: eth{module}b
+    type: 10gbase-x-sfpp
diff --git a/module-types/HPE/Q8C03B.yaml b/module-types/HPE/Q8C03B.yaml
new file mode 100644
index 000000000..a5a79b932
--- /dev/null
+++ b/module-types/HPE/Q8C03B.yaml
@@ -0,0 +1,13 @@
+---
+manufacturer: HPE
+model: HPE Nimble Storage 2x16Gb Fibre Channel 4-port FIO Adapter Kit
+part_number: Q8C03B
+interfaces:
+  - name: fc{module}a
+    type: 16gfc-sfpp
+  - name: fc{module}b
+    type: 16gfc-sfpp
+  - name: fc{module}c
+    type: 16gfc-sfpp
+  - name: fc{module}d
+    type: 16gfc-sfpp
diff --git a/module-types/HPE/Q8C09B.yaml b/module-types/HPE/Q8C09B.yaml
new file mode 100644
index 000000000..88a5336fc
--- /dev/null
+++ b/module-types/HPE/Q8C09B.yaml
@@ -0,0 +1,13 @@
+---
+manufacturer: HPE
+model: HPE Nimble Storage 2x1GbE 4-port FIO Adapter Kit
+part_number: Q8C09B
+interfaces:
+  - name: eth{module}a
+    type: 1000base-t
+  - name: eth{module}b
+    type: 1000base-t
+  - name: eth{module}c
+    type: 1000base-t
+  - name: eth{module}d
+    type: 1000base-t
diff --git a/module-types/HPE/Q8C17B.yaml b/module-types/HPE/Q8C17B.yaml
new file mode 100644
index 000000000..ec44cb440
--- /dev/null
+++ b/module-types/HPE/Q8C17B.yaml
@@ -0,0 +1,13 @@
+---
+manufacturer: HPE
+model: HPE Nimble Storage 2x10GbE 4-port FIO Adapter Kit
+part_number: Q8C17B
+interfaces:
+  - name: eth{module}a
+    type: 10gbase-x-sfpp
+  - name: eth{module}b
+    type: 10gbase-x-sfpp
+  - name: eth{module}c
+    type: 10gbase-x-sfpp
+  - name: eth{module}d
+    type: 10gbase-x-sfpp
diff --git a/module-types/HPE/Q8C20B.yaml b/module-types/HPE/Q8C20B.yaml
new file mode 100644
index 000000000..834e72a1b
--- /dev/null
+++ b/module-types/HPE/Q8C20B.yaml
@@ -0,0 +1,13 @@
+---
+manufacturer: HPE
+model: HPE Nimble Storage 2x10GBASE-T 4-port FIO Adapter Kit
+part_number: Q8C20B
+interfaces:
+  - name: eth{module}a
+    type: 10gbase-t
+  - name: eth{module}b
+    type: 10gbase-t
+  - name: eth{module}c
+    type: 10gbase-t
+  - name: eth{module}d
+    type: 10gbase-t
diff --git a/module-types/HPE/R3Q00A.yaml b/module-types/HPE/R3Q00A.yaml
new file mode 100644
index 000000000..4345069f8
--- /dev/null
+++ b/module-types/HPE/R3Q00A.yaml
@@ -0,0 +1,9 @@
+---
+manufacturer: HPE
+model: HPE Nimble Storage 2x25GbE 2-port FIO Adapter Kit
+part_number: R3Q00A
+interfaces:
+  - name: eth{module}a
+    type: 25gbase-x-sfp28
+  - name: eth{module}b
+    type: 25gbase-x-sfp28
diff --git a/module-types/HPE/R4G78A.yaml b/module-types/HPE/R4G78A.yaml
new file mode 100644
index 000000000..fb7d10003
--- /dev/null
+++ b/module-types/HPE/R4G78A.yaml
@@ -0,0 +1,9 @@
+---
+manufacturer: HPE
+model: HPE Nimble Storage 2x32Gb Fibre Channel 2-port FIO Adapter Kit
+part_number: R4G78A
+interfaces:
+  - name: fc{module}a
+    type: 32gfc-sfp28
+  - name: fc{module}b
+    type: 32gfc-sfp28