diff --git a/device-types/NetApp/AFF-C60-Chassis.yaml b/device-types/NetApp/AFF-C60-Chassis.yaml
new file mode 100644
index 00000000..3a06e767
--- /dev/null
+++ b/device-types/NetApp/AFF-C60-Chassis.yaml
@@ -0,0 +1,24 @@
+---
+manufacturer: NetApp
+model: AFF-C60 Chassis
+slug: netapp-aff-c60-chassis
+description: AFF C60 HA System Chassis
+part_number: AFF-C60A-100-C
+u_height: 2.0
+is_full_depth: true
+subdevice_role: parent
+airflow: front-to-rear
+weight: 27.5
+weight_unit: kg
+front_image: true
+rear_image: true
+module-bays:
+  - name: PSU 1
+    position: '1'
+  - name: PSU 2
+    position: '2'
+device-bays:
+  - name: A
+    description: A
+  - name: B
+    description: B
diff --git a/device-types/NetApp/AFF-C60-Controller.yaml b/device-types/NetApp/AFF-C60-Controller.yaml
new file mode 100644
index 00000000..6004c9f1
--- /dev/null
+++ b/device-types/NetApp/AFF-C60-Controller.yaml
@@ -0,0 +1,33 @@
+---
+manufacturer: NetApp
+model: AFF-C60 Controller
+slug: netapp-aff-c60-001
+description: AFF C60 HA System Controller
+part_number: AFF-C60-001
+u_height: 0.0
+is_full_depth: true
+subdevice_role: child
+console-ports:
+  - name: IOIOI
+    type: rj-45
+interfaces:
+  - name: e0M
+    type: 1000base-t
+    mgmt_only: true
+rear-ports:
+  - name: IOIOI
+    type: usb-c
+    positions: 1
+module-bays:
+  - name: Karte 1
+    position: '1'
+    description: Karte 1
+  - name: Karte 2
+    position: '2'
+    description: Karte 2
+  - name: Karte 3
+    position: '3'
+    description: Karte 3
+  - name: Karte 4
+    position: '4'
+    description: Karte 4
diff --git a/device-types/NetApp/NS224-T-0-24-CF-C.yaml b/device-types/NetApp/NS224-T-0-24-CF-C.yaml
new file mode 100644
index 00000000..4f4c435a
--- /dev/null
+++ b/device-types/NetApp/NS224-T-0-24-CF-C.yaml
@@ -0,0 +1,27 @@
+---
+manufacturer: NetApp
+model: NS224-T-0-24-CF-C
+slug: netapp-ns224-t-0-24-cf-c
+description: NVMe SHLF,2U24,Empty,NSM100B,CF
+part_number: NS224-T-0-24-CF-C
+u_height: 2.0
+is_full_depth: true
+airflow: front-to-rear
+weight: 23.0
+weight_unit: kg
+front_image: true
+rear_image: true
+interfaces:
+  - name: a-e0a
+    type: 100gbase-x-qsfp28
+  - name: a-e0b
+    type: 100gbase-x-qsfp28
+  - name: b-e0a
+    type: 100gbase-x-qsfp28
+  - name: b-e0b
+    type: 100gbase-x-qsfp28
+module-bays:
+  - name: PSU 1
+    position: '1'
+  - name: PSU 2
+    position: '2'
diff --git a/elevation-images/NetApp/netapp-aff-c60-chassis.front.png b/elevation-images/NetApp/netapp-aff-c60-chassis.front.png
new file mode 100644
index 00000000..c1fd7889
Binary files /dev/null and b/elevation-images/NetApp/netapp-aff-c60-chassis.front.png differ
diff --git a/elevation-images/NetApp/netapp-aff-c60-chassis.rear.png b/elevation-images/NetApp/netapp-aff-c60-chassis.rear.png
new file mode 100644
index 00000000..16212b41
Binary files /dev/null and b/elevation-images/NetApp/netapp-aff-c60-chassis.rear.png differ
diff --git a/elevation-images/NetApp/netapp-ns224-t-0-24-cf-c.front.png b/elevation-images/NetApp/netapp-ns224-t-0-24-cf-c.front.png
new file mode 100644
index 00000000..98fc1a45
Binary files /dev/null and b/elevation-images/NetApp/netapp-ns224-t-0-24-cf-c.front.png differ
diff --git a/elevation-images/NetApp/netapp-ns224-t-0-24-cf-c.rear.png b/elevation-images/NetApp/netapp-ns224-t-0-24-cf-c.rear.png
new file mode 100644
index 00000000..18df41b7
Binary files /dev/null and b/elevation-images/NetApp/netapp-ns224-t-0-24-cf-c.rear.png differ
diff --git a/module-types/NetApp/X60130A-C.yaml b/module-types/NetApp/X60130A-C.yaml
new file mode 100644
index 00000000..f036e3a2
--- /dev/null
+++ b/module-types/NetApp/X60130A-C.yaml
@@ -0,0 +1,10 @@
+---
+manufacturer: NetApp
+model: X60130A-C
+part_number: X60130A-C
+description: IO Module,2PT,100GbE
+interfaces:
+  - name: e{module}a
+    type: 100gbase-x-qsfp28
+  - name: e{module}b
+    type: 100gbase-x-qsfp28
diff --git a/module-types/NetApp/X60131A-C.yaml b/module-types/NetApp/X60131A-C.yaml
new file mode 100644
index 00000000..bc5beb5c
--- /dev/null
+++ b/module-types/NetApp/X60131A-C.yaml
@@ -0,0 +1,10 @@
+---
+manufacturer: NetApp
+model: X60131A-C
+part_number: X60131A-C
+description: IO Module,2PT,10/25GbE
+interfaces:
+  - name: e{module}a
+    type: 25gbase-x-sfp28
+  - name: e{module}b
+    type: 25gbase-x-sfp28
diff --git a/module-types/NetApp/X60132A-C.yaml b/module-types/NetApp/X60132A-C.yaml
new file mode 100644
index 00000000..5eb62372
--- /dev/null
+++ b/module-types/NetApp/X60132A-C.yaml
@@ -0,0 +1,14 @@
+---
+manufacturer: NetApp
+model: X60132A-C
+part_number: X60132A-C
+description: IO Module,4PT,10/25GbE
+interfaces:
+  - name: e{module}a
+    type: 25gbase-x-sfp28
+  - name: e{module}b
+    type: 25gbase-x-sfp28
+  - name: e{module}c
+    type: 25gbase-x-sfp28
+  - name: e{module}d
+    type: 25gbase-x-sfp28
diff --git a/module-types/NetApp/X97602A-C.yaml b/module-types/NetApp/X97602A-C.yaml
new file mode 100644
index 00000000..aaa05a1b
--- /dev/null
+++ b/module-types/NetApp/X97602A-C.yaml
@@ -0,0 +1,9 @@
+---
+manufacturer: NetApp
+model: X97602A-C
+part_number: X97602A-C
+description: Power Supply,1600W,Titanium,-C
+power-ports:
+  - name: PSU-{module}
+    type: iec-60320-c14
+    maximum_draw: 1600