diff --git a/module-types/Nokia/XCM2s-XMA2s-36-TIER1.yaml b/module-types/Nokia/XCM2s-XMA2s-36-TIER1.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..7d98a18c770f77ebacfaa4176724fdbd11d04715
--- /dev/null
+++ b/module-types/Nokia/XCM2s-XMA2s-36-TIER1.yaml
@@ -0,0 +1,199 @@
+---
+manufacturer: Nokia
+model: XMA2-s-36p-400g
+slug: nokia-xma2s-36p-400g
+part_number: 3HE17771AA
+comments: XMA2-s 36-port card with 9.6T licence inside XCM2-s
+interfaces:
+  - name: '{module}/1/c1'
+    type: other
+  - name: '{module}/1/c1/1'
+    type: 400gbase-x-qsfpdd
+  - name: '{module}/1/c2'
+    type: other
+  - name: '{module}/1/c2/1'
+    type: 10gbase-t
+  - name: '{module}/1/c2/2'
+    type: 10gbase-t
+  - name: '{module}/1/c2/3'
+    type: 10gbase-t
+  - name: '{module}/1/c2/4'
+    type: 10gbase-t
+  - name: '{module}/1/c3'
+    type: other # reserved
+  - name: '{module}/1/c4'
+    type: other
+  - name: '{module}/1/c4/1'
+    type: 10gbase-t
+  - name: '{module}/1/c4/2'
+    type: 10gbase-t
+  - name: '{module}/1/c4/3'
+    type: 10gbase-t
+  - name: '{module}/1/c4/4'
+    type: 10gbase-t
+  - name: '{module}/1/c5'
+    type: other
+  - name: '{module}/1/c5/1'
+    type: 400gbase-x-qsfpdd
+  - name: '{module}/1/c6'
+    type: other # reserved
+  - name: '{module}/1/c7'
+    type: other
+  - name: '{module}/1/c7/1'
+    type: 400gbase-x-qsfpdd
+  - name: '{module}/1/c8'
+    type: other
+  - name: '{module}/1/c8/1'
+    type: 100gbase-x-qsfpdd
+  - name: '{module}/1/c8/2'
+    type: 100gbase-x-qsfpdd
+  - name: '{module}/1/c9'
+    type: other
+  - name: '{module}/1/c9/1'
+    type: 100gbase-x-qsfpdd
+  - name: '{module}/1/c9/2'
+    type: 100gbase-x-qsfpdd
+  - name: '{module}/1/c10'
+    type: other
+  - name: '{module}/1/c10/1'
+    type: 400gbase-x-qsfpdd
+  - name: '{module}/1/c11'
+    type: other
+  - name: '{module}/1/c11/1'
+    type: 100gbase-x-qsfpdd
+  - name: '{module}/1/c11/2'
+    type: 100gbase-x-qsfpdd
+  - name: '{module}/1/c12'
+    type: other
+  - name: '{module}/1/c12/1'
+    type: 100gbase-x-qsfpdd
+  - name: '{module}/1/c12/2'
+    type: 100gbase-x-qsfpdd
+  - name: '{module}/1/c13'
+    type: other
+  - name: '{module}/1/c13/1'
+    type: 400gbase-x-qsfpdd
+  - name: '{module}/1/c14'
+    type: other
+  - name: '{module}/1/c14/1'
+    type: 10gbase-t
+  - name: '{module}/1/c14/2'
+    type: 10gbase-t
+  - name: '{module}/1/c14/3'
+    type: 10gbase-t
+  - name: '{module}/1/c14/4'
+    type: 10gbase-t
+  - name: '{module}/1/c15'
+    type: other # reserved
+  - name: '{module}/1/c16'
+    type: other
+  - name: '{module}/1/c16/1'
+    type: 10gbase-t
+  - name: '{module}/1/c16/2'
+    type: 10gbase-t
+  - name: '{module}/1/c16/3'
+    type: 10gbase-t
+  - name: '{module}/1/c16/4'
+    type: 10gbase-t
+  - name: '{module}/1/c17'
+    type: other
+  - name: '{module}/1/c17/1'
+    type: 400gbase-x-qsfpdd
+  - name: '{module}/1/c18'
+    type: other # reserved
+  - name: '{module}/1/c19'
+    type: other
+  - name: '{module}/1/c19/1'
+    type: 400gbase-x-qsfpdd
+  - name: '{module}/1/c20'
+    type: other
+  - name: '{module}/1/c20/1'
+    type: 10gbase-t
+  - name: '{module}/1/c20/2'
+    type: 10gbase-t
+  - name: '{module}/1/c20/3'
+    type: 10gbase-t
+  - name: '{module}/1/c20/4'
+    type: 10gbase-t
+  - name: '{module}/1/c21'
+    type: other # reserved
+  - name: '{module}/1/c22'
+    type: other
+  - name: '{module}/1/c22/1'
+    type: 10gbase-t
+  - name: '{module}/1/c22/2'
+    type: 10gbase-t
+  - name: '{module}/1/c22/3'
+    type: 10gbase-t
+  - name: '{module}/1/c22/4'
+    type: 10gbase-t
+  - name: '{module}/1/c23'
+    type: other
+  - name: '{module}/1/c23/1'
+    type: 400gbase-x-qsfpdd
+  - name: '{module}/1/c24'
+    type: other # reserved
+  - name: '{module}/1/c25'
+    type: other
+  - name: '{module}/1/c25/1'
+    type: 400gbase-x-qsfpdd
+  - name: '{module}/1/c26'
+    type: other
+  - name: '{module}/1/c26/1'
+    type: 100gbase-x-qsfpdd
+  - name: '{module}/1/c26/2'
+    type: 100gbase-x-qsfpdd
+  - name: '{module}/1/c27'
+    type: other
+  - name: '{module}/1/c27/1'
+    type: 100gbase-x-qsfpdd
+  - name: '{module}/1/c27/2'
+    type: 100gbase-x-qsfpdd
+  - name: '{module}/1/c28'
+    type: other
+  - name: '{module}/1/c28/1'
+    type: 400gbase-x-qsfpdd
+  - name: '{module}/1/c29'
+    type: other
+  - name: '{module}/1/c29/1'
+    type: 100gbase-x-qsfpdd
+  - name: '{module}/1/c29/2'
+    type: 100gbase-x-qsfpdd
+  - name: '{module}/1/c30'
+    type: other
+  - name: '{module}/1/c30/1'
+    type: 100gbase-x-qsfpdd
+  - name: '{module}/1/c30/2'
+    type: 100gbase-x-qsfpdd
+  - name: '{module}/1/c31'
+    type: other
+  - name: '{module}/1/c31/1'
+    type: 400gbase-x-qsfpdd
+  - name: '{module}/1/c32'
+    type: other
+  - name: '{module}/1/c32/1'
+    type: 10gbase-t
+  - name: '{module}/1/c32/2'
+    type: 10gbase-t
+  - name: '{module}/1/c32/3'
+    type: 10gbase-t
+  - name: '{module}/1/c32/4'
+    type: 10gbase-t
+  - name: '{module}/1/c33'
+    type: other # reserved
+  - name: '{module}/1/c34'
+    type: other
+  - name: '{module}/1/c34/1'
+    type: 10gbase-t
+  - name: '{module}/1/c34/2'
+    type: 10gbase-t
+  - name: '{module}/1/c34/3'
+    type: 10gbase-t
+  - name: '{module}/1/c34/4'
+    type: 10gbase-t
+  - name: '{module}/1/c35'
+    type: other
+  - name: '{module}/1/c35/1'
+    type: 400gbase-x-qsfpdd
+  - name: '{module}/1/c36'
+    type: other # reserved