diff --git a/device-types/HPE/Apollo-R2000-chassis.yaml b/device-types/HPE/Apollo-R2000-chassis.yaml
new file mode 100644
index 00000000..89f6d1a1
--- /dev/null
+++ b/device-types/HPE/Apollo-R2000-chassis.yaml
@@ -0,0 +1,36 @@
+---
+manufacturer: HPE
+model: Apollo R2000 Chassis
+slug: hpe-apollo-r2000-chassis
+u_height: 2.0
+is_full_depth: true
+subdevice_role: parent
+part_number: 798152-B21/798153-B21/798152-B21
+weight: 25
+weight_unit: kg
+airflow: front-to-rear
+comments: |
+  [Apollo R2000 Chassis Spec Sheet](https://psnow.ext.hpe.com/v2/getpdf.aspx/c04542552.pdf?ver=7)
+device-bays:
+  - name: '1'
+    label: Node 1
+    description: Server Tray
+  - name: '2'
+    label: Node 2
+    description: Server Tray
+  - name: '3'
+    label: Node 3
+    description: Server Tray
+  - name: '4'
+    label: Node 4
+    description: Server Tray
+module-bays:
+  - name: RCM
+    position: RCM
+    description: RCM Module
+  - name: Power 1
+    position: '1'
+    description: PSU Slot
+  - name: Power 2
+    position: '2'
+    description: PSU Slot
diff --git a/device-types/HPE/Apollo-R2200-chassis.yaml b/device-types/HPE/Apollo-R2200-chassis.yaml
new file mode 100644
index 00000000..97296f56
--- /dev/null
+++ b/device-types/HPE/Apollo-R2200-chassis.yaml
@@ -0,0 +1,36 @@
+---
+manufacturer: HPE
+model: Apollo R2200 Chassis
+slug: hpe-apollo-r2200-chassis
+u_height: 2.0
+is_full_depth: true
+subdevice_role: parent
+part_number: 798152-B21
+weight: 25
+weight_unit: kg
+airflow: front-to-rear
+comments: |
+  [Apollo R2200 Chassis Spec Sheet](https://psnow.ext.hpe.com/v2/getpdf.aspx/c04542552.pdf?ver=7)
+device-bays:
+  - name: '1'
+    label: Node 1
+    description: Server Tray
+  - name: '2'
+    label: Node 2
+    description: Server Tray
+  - name: '3'
+    label: Node 3
+    description: Server Tray
+  - name: '4'
+    label: Node 4
+    description: Server Tray
+module-bays:
+  - name: RCM
+    position: RCM
+    description: RCM Module
+  - name: Power 1
+    position: '1'
+    description: PSU Slot
+  - name: Power 2
+    position: '2'
+    description: PSU Slot
diff --git a/device-types/HPE/Apollo-R2600-chassis.yaml b/device-types/HPE/Apollo-R2600-chassis.yaml
new file mode 100644
index 00000000..d9532b31
--- /dev/null
+++ b/device-types/HPE/Apollo-R2600-chassis.yaml
@@ -0,0 +1,36 @@
+---
+manufacturer: HPE
+model: Apollo R2600 Chassis
+slug: hpe-apollo-r2600-chassis
+u_height: 2.0
+is_full_depth: true
+subdevice_role: parent
+part_number: 798153-B21
+weight: 25
+weight_unit: kg
+airflow: front-to-rear
+comments: |
+  [Apollo R2600 Chassis Spec Sheet](https://psnow.ext.hpe.com/v2/getpdf.aspx/c04542552.pdf?ver=7)
+device-bays:
+  - name: '1'
+    label: Node 1
+    description: Server Tray
+  - name: '2'
+    label: Node 2
+    description: Server Tray
+  - name: '3'
+    label: Node 3
+    description: Server Tray
+  - name: '4'
+    label: Node 4
+    description: Server Tray
+module-bays:
+  - name: RCM
+    position: RCM
+    description: RCM Module
+  - name: Power 1
+    position: '1'
+    description: PSU Slot
+  - name: Power 2
+    position: '2'
+    description: PSU Slot
diff --git a/device-types/HPE/Apollo-R2800-chassis.yaml b/device-types/HPE/Apollo-R2800-chassis.yaml
new file mode 100644
index 00000000..a5755a91
--- /dev/null
+++ b/device-types/HPE/Apollo-R2800-chassis.yaml
@@ -0,0 +1,36 @@
+---
+manufacturer: HPE
+model: Apollo R2800 Chassis
+slug: hpe-apollo-r2800-chassis
+u_height: 2.0
+is_full_depth: true
+subdevice_role: parent
+part_number: 798154-B21
+weight: 25
+weight_unit: kg
+airflow: front-to-rear
+comments: |
+  [Apollo R2800 Chassis Spec Sheet](https://psnow.ext.hpe.com/v2/getpdf.aspx/c04542552.pdf?ver=7)
+device-bays:
+  - name: '1'
+    label: Node 1
+    description: Server Tray
+  - name: '2'
+    label: Node 2
+    description: Server Tray
+  - name: '3'
+    label: Node 3
+    description: Server Tray
+  - name: '4'
+    label: Node 4
+    description: Server Tray
+module-bays:
+  - name: RCM
+    position: RCM
+    description: RCM Module
+  - name: Power 1
+    position: '1'
+    description: PSU Slot
+  - name: Power 2
+    position: '2'
+    description: PSU Slot
diff --git a/device-types/HPE/proliant-xl170r-g9-1u.yaml b/device-types/HPE/proliant-xl170r-g9-1u.yaml
new file mode 100644
index 00000000..9be25c74
--- /dev/null
+++ b/device-types/HPE/proliant-xl170r-g9-1u.yaml
@@ -0,0 +1,13 @@
+---
+manufacturer: HPE
+model: ProLiant XL170r G9 (1U)
+slug: hpe-proliant-xl170r-g9-1u
+part_number: 798155-B21
+u_height: 0.0
+is_full_depth: true
+subdevice_role: child
+airflow: front-to-rear
+weight: 1.5
+weight_unit: kg
+comments: |
+  [Spec Sheet](https://www.hpe.com/psnow/doc/c04545612)
diff --git a/device-types/HPE/proliant-xl170r-g9-2u.yaml b/device-types/HPE/proliant-xl170r-g9-2u.yaml
new file mode 100644
index 00000000..b502df37
--- /dev/null
+++ b/device-types/HPE/proliant-xl170r-g9-2u.yaml
@@ -0,0 +1,13 @@
+---
+manufacturer: HPE
+model: ProLiant XL170r G9 (2U)
+slug: hpe-proliant-xl170r-g9-2u
+part_number: 798156-B21
+u_height: 0.0
+is_full_depth: true
+subdevice_role: child
+airflow: front-to-rear
+weight: 1.5
+weight_unit: kg
+comments: |
+  [Spec Sheet](https://www.hpe.com/psnow/doc/c04545612)
diff --git a/module-types/HPE/Apollo-R2000-RCM-Module.yaml b/module-types/HPE/Apollo-R2000-RCM-Module.yaml
new file mode 100644
index 00000000..0d903e02
--- /dev/null
+++ b/module-types/HPE/Apollo-R2000-RCM-Module.yaml
@@ -0,0 +1,21 @@
+---
+manufacturer: HPE
+model: Apollo R2000 RCM Module
+part_number: 798211-B21
+weight: 0.5
+weight_unit: kg
+comments: '[Spec Sheet](https://support.hpe.com/hpesc/public/docDisplay?docId=a00048722en_us&page=GUID-471C8273-9C50-490F-AE21-6F6F2521CA94.html)'
+interfaces:
+  - name: ilo-bottom
+    type: 1000base-t
+    enabled: true
+    mgmt_only: true
+  - name: ilo-top
+    type: 1000base-t
+    enabled: true
+    mgmt_only: true
+rear-ports:
+  - name: APM
+    type: other
+    positions: 1
+    label: HPE-APM 2.0