diff --git a/device-types/HPE/HP-3100-16-v2-EI.yaml b/device-types/HPE/HP-3100-16-v2-EI.yaml
new file mode 100644
index 00000000..7d875537
--- /dev/null
+++ b/device-types/HPE/HP-3100-16-v2-EI.yaml
@@ -0,0 +1,59 @@
+---
+manufacturer: HPE
+model: 3100-16 v2 EI
+slug: hpe-3100-16-v2-ei
+part_number: JD319B
+u_height: 1
+is_full_depth: false
+comments: '[HPE FlexNetwork 3100 EI Switch Series - QuickSpecs](https://support.hpe.com/hpesc/public/docDisplay?docLocale=en_US&docId=c04111573)'
+weight: 2.5
+weight_unit: kg
+console-ports:
+  - name: Console
+    type: rj-45
+power-ports:
+  - name: PS1
+    type: iec-60320-c14
+    maximum_draw: 12
+interfaces:
+  - name: Ethernet1/0/1
+    type: 100base-tx
+  - name: Ethernet1/0/2
+    type: 100base-tx
+  - name: Ethernet1/0/3
+    type: 100base-tx
+  - name: Ethernet1/0/4
+    type: 100base-tx
+  - name: Ethernet1/0/5
+    type: 100base-tx
+  - name: Ethernet1/0/6
+    type: 100base-tx
+  - name: Ethernet1/0/7
+    type: 100base-tx
+  - name: Ethernet1/0/8
+    type: 100base-tx
+  - name: Ethernet1/0/9
+    type: 100base-tx
+  - name: Ethernet1/0/10
+    type: 100base-tx
+  - name: Ethernet1/0/11
+    type: 100base-tx
+  - name: Ethernet1/0/12
+    type: 100base-tx
+  - name: Ethernet1/0/13
+    type: 100base-tx
+  - name: Ethernet1/0/14
+    type: 100base-tx
+  - name: Ethernet1/0/15
+    type: 100base-tx
+  - name: Ethernet1/0/16
+    type: 100base-tx
+# dual personality port
+  - name: GigabitEthernet1/0/17
+    type: 1000base-t
+# - name: GigabitEthernet1/0/17
+#   type: 1000base-x-sfp
+  - name: GigabitEthernet1/0/18
+    type: 1000base-t
+# - name: GigabitEthernet1/0/18
+#   type: 1000base-x-sfp
diff --git a/device-types/HPE/HP-3100-24-PoE-v2-EI.yaml b/device-types/HPE/HP-3100-24-PoE-v2-EI.yaml
new file mode 100644
index 00000000..c238984b
--- /dev/null
+++ b/device-types/HPE/HP-3100-24-PoE-v2-EI.yaml
@@ -0,0 +1,75 @@
+---
+manufacturer: HPE
+model: 3100-24-PoE v2 EI
+slug: hpe-3100-24-poe-v2-ei
+part_number: JD313B
+u_height: 1
+is_full_depth: false
+comments: '[HPE FlexNetwork 3100 EI Switch Series - QuickSpecs](https://support.hpe.com/hpesc/public/docDisplay?docLocale=en_US&docId=c04111573)'
+weight: 6.5
+weight_unit: kg
+console-ports:
+  - name: Console
+    type: rj-45
+power-ports:
+  - name: PS1
+    type: iec-60320-c14
+    maximum_draw: 465
+interfaces:
+  - name: Ethernet1/0/1
+    type: 100base-tx
+  - name: Ethernet1/0/2
+    type: 100base-tx
+  - name: Ethernet1/0/3
+    type: 100base-tx
+  - name: Ethernet1/0/4
+    type: 100base-tx
+  - name: Ethernet1/0/5
+    type: 100base-tx
+  - name: Ethernet1/0/6
+    type: 100base-tx
+  - name: Ethernet1/0/7
+    type: 100base-tx
+  - name: Ethernet1/0/8
+    type: 100base-tx
+  - name: Ethernet1/0/9
+    type: 100base-tx
+  - name: Ethernet1/0/10
+    type: 100base-tx
+  - name: Ethernet1/0/11
+    type: 100base-tx
+  - name: Ethernet1/0/12
+    type: 100base-tx
+  - name: Ethernet1/0/13
+    type: 100base-tx
+  - name: Ethernet1/0/14
+    type: 100base-tx
+  - name: Ethernet1/0/15
+    type: 100base-tx
+  - name: Ethernet1/0/16
+    type: 100base-tx
+  - name: Ethernet1/0/17
+    type: 100base-tx
+  - name: Ethernet1/0/18
+    type: 100base-tx
+  - name: Ethernet1/0/19
+    type: 100base-tx
+  - name: Ethernet1/0/20
+    type: 100base-tx
+  - name: Ethernet1/0/21
+    type: 100base-tx
+  - name: Ethernet1/0/22
+    type: 100base-tx
+  - name: Ethernet1/0/23
+    type: 100base-tx
+  - name: Ethernet1/0/24
+    type: 100base-tx
+# dual personality port
+  - name: GigabitEthernet1/0/25
+    type: 1000base-t
+# - name: GigabitEthernet1/0/25
+#   type: 1000base-x-sfp
+  - name: GigabitEthernet1/0/26
+    type: 1000base-t
+# - name: GigabitEthernet1/0/26
+#   type: 1000base-x-sfp
diff --git a/device-types/HPE/HP-3100-24-v2-EI.yaml b/device-types/HPE/HP-3100-24-v2-EI.yaml
index 36c4a586..f9a99277 100644
--- a/device-types/HPE/HP-3100-24-v2-EI.yaml
+++ b/device-types/HPE/HP-3100-24-v2-EI.yaml
@@ -5,66 +5,71 @@ slug: hpe-3100-24-v2-ei
 part_number: JD320B
 u_height: 1
 is_full_depth: false
-comments: Replaced by HPE FlexNetwork 5120 24G SI Switch (JE074B) - [HPE FlexNetwork 5120 SI Switch Series - Specifications](https://www.hpe.com/psnow/doc/c04111588.pdf?jumpid=in_lit-psnow-getpdf)
+comments: '[HPE FlexNetwork 3100 EI Switch Series - QuickSpecs](https://support.hpe.com/hpesc/public/docDisplay?docLocale=en_US&docId=c04111573)'
 weight: 3.5
 weight_unit: kg
 console-ports:
   - name: Console
     type: rj-45
+power-ports:
+  - name: PS1
+    type: iec-60320-c14
+    maximum_draw: 13
 interfaces:
-  - name: GigabitEthernet1/0/1
-    type: 1000base-t
-  - name: GigabitEthernet1/0/2
-    type: 1000base-t
-  - name: GigabitEthernet1/0/3
-    type: 1000base-t
-  - name: GigabitEthernet1/0/4
-    type: 1000base-t
-  - name: GigabitEthernet1/0/5
-    type: 1000base-t
-  - name: GigabitEthernet1/0/6
-    type: 1000base-t
-  - name: GigabitEthernet1/0/7
-    type: 1000base-t
-  - name: GigabitEthernet1/0/8
-    type: 1000base-t
-  - name: GigabitEthernet1/0/9
-    type: 1000base-t
-  - name: GigabitEthernet1/0/10
-    type: 1000base-t
-  - name: GigabitEthernet1/0/11
-    type: 1000base-t
-  - name: GigabitEthernet1/0/12
-    type: 1000base-t
-  - name: GigabitEthernet1/0/13
-    type: 1000base-t
-  - name: GigabitEthernet1/0/14
-    type: 1000base-t
-  - name: GigabitEthernet1/0/15
-    type: 1000base-t
-  - name: GigabitEthernet1/0/16
-    type: 1000base-t
-  - name: GigabitEthernet1/0/17
-    type: 1000base-t
-  - name: GigabitEthernet1/0/18
-    type: 1000base-t
-  - name: GigabitEthernet1/0/19
-    type: 1000base-t
-  - name: GigabitEthernet1/0/20
-    type: 1000base-t
-  - name: GigabitEthernet1/0/21
-    type: 1000base-t
-  - name: GigabitEthernet1/0/22
-    type: 1000base-t
-  - name: GigabitEthernet1/0/23
-    type: 1000base-t
-  - name: GigabitEthernet1/0/24
-    type: 1000base-t
+  - name: Ethernet1/0/1
+    type: 100base-tx
+  - name: Ethernet1/0/2
+    type: 100base-tx
+  - name: Ethernet1/0/3
+    type: 100base-tx
+  - name: Ethernet1/0/4
+    type: 100base-tx
+  - name: Ethernet1/0/5
+    type: 100base-tx
+  - name: Ethernet1/0/6
+    type: 100base-tx
+  - name: Ethernet1/0/7
+    type: 100base-tx
+  - name: Ethernet1/0/8
+    type: 100base-tx
+  - name: Ethernet1/0/9
+    type: 100base-tx
+  - name: Ethernet1/0/10
+    type: 100base-tx
+  - name: Ethernet1/0/11
+    type: 100base-tx
+  - name: Ethernet1/0/12
+    type: 100base-tx
+  - name: Ethernet1/0/13
+    type: 100base-tx
+  - name: Ethernet1/0/14
+    type: 100base-tx
+  - name: Ethernet1/0/15
+    type: 100base-tx
+  - name: Ethernet1/0/16
+    type: 100base-tx
+  - name: Ethernet1/0/17
+    type: 100base-tx
+  - name: Ethernet1/0/18
+    type: 100base-tx
+  - name: Ethernet1/0/19
+    type: 100base-tx
+  - name: Ethernet1/0/20
+    type: 100base-tx
+  - name: Ethernet1/0/21
+    type: 100base-tx
+  - name: Ethernet1/0/22
+    type: 100base-tx
+  - name: Ethernet1/0/23
+    type: 100base-tx
+  - name: Ethernet1/0/24
+    type: 100base-tx
+# dual personality port
   - name: GigabitEthernet1/0/25
-    type: 1000base-x-sfp
+    type: 1000base-t
+# - name: GigabitEthernet1/0/25
+#   type: 1000base-x-sfp
   - name: GigabitEthernet1/0/26
-    type: 1000base-x-sfp
-  - name: GigabitEthernet1/0/27
-    type: 1000base-x-sfp
-  - name: GigabitEthernet1/0/28
-    type: 1000base-x-sfp
+    type: 1000base-t
+# - name: GigabitEthernet1/0/26
+#   type: 1000base-x-sfp
diff --git a/device-types/HPE/HP-3100-8-v2-EI.yaml b/device-types/HPE/HP-3100-8-v2-EI.yaml
new file mode 100644
index 00000000..0e003eff
--- /dev/null
+++ b/device-types/HPE/HP-3100-8-v2-EI.yaml
@@ -0,0 +1,39 @@
+---
+manufacturer: HPE
+model: 3100-8 v2 EI
+slug: hpe-3100-8-v2-ei
+part_number: JD318B
+u_height: 1
+is_full_depth: false
+comments: '[HPE FlexNetwork 3100 EI Switch Series - QuickSpecs](https://support.hpe.com/hpesc/public/docDisplay?docLocale=en_US&docId=c04111573)'
+weight: 1.8
+weight_unit: kg
+console-ports:
+  - name: Console
+    type: rj-45
+power-ports:
+  - name: PS1
+    type: iec-60320-c14
+    maximum_draw: 9
+interfaces:
+  - name: Ethernet1/0/1
+    type: 100base-tx
+  - name: Ethernet1/0/2
+    type: 100base-tx
+  - name: Ethernet1/0/3
+    type: 100base-tx
+  - name: Ethernet1/0/4
+    type: 100base-tx
+  - name: Ethernet1/0/5
+    type: 100base-tx
+  - name: Ethernet1/0/6
+    type: 100base-tx
+  - name: Ethernet1/0/7
+    type: 100base-tx
+  - name: Ethernet1/0/8
+    type: 100base-tx
+# dual personality port
+  - name: GigabitEthernet1/0/9
+    type: 1000base-t
+# - name: GigabitEthernet1/0/9
+#   type: 1000base-x-sfp