diff --git a/module-types/Nokia/XCM2s-XMA2s-36-400G.yaml b/module-types/Nokia/XCM2s-XMA2s-36-400G.yaml
index 1b7b53c982a8a115cb64eff89402b114d81ed6a6..30504e42c8b3fa510e94bcf9b2b9d8b1909ef9a0 100644
--- a/module-types/Nokia/XCM2s-XMA2s-36-400G.yaml
+++ b/module-types/Nokia/XCM2s-XMA2s-36-400G.yaml
@@ -4,77 +4,75 @@ model: XCM2s-XMA2s-36p-400g
 part_number: 3HE17771AA
 comments: XMA2-s 36-port card with 9.6T licence inside XCM2-s
 interfaces:
-  - name: '{module}/0/0'
-    type: 400gbase-x-qsfpp
   - name: '{module}/0/1'
-    type: 400gbase-x-qsfpp
+    type: 400gbase-x-qsfpdd
   - name: '{module}/0/2'
-    type: 400gbase-x-qsfpp
+    type: 400gbase-x-qsfpdd
   - name: '{module}/0/3'
-    type: 400gbase-x-qsfpp
+    type: 400gbase-x-qsfpdd
   - name: '{module}/0/4'
-    type: 400gbase-x-qsfpp
+    type: 400gbase-x-qsfpdd
   - name: '{module}/0/5'
-    type: 400gbase-x-qsfpp
+    type: 400gbase-x-qsfpdd
   - name: '{module}/0/6'
-    type: 400gbase-x-qsfpp
+    type: 400gbase-x-qsfpdd
   - name: '{module}/0/7'
-    type: 400gbase-x-qsfpp
+    type: 400gbase-x-qsfpdd
   - name: '{module}/0/8'
-    type: 400gbase-x-qsfpp
+    type: 400gbase-x-qsfpdd
   - name: '{module}/0/9'
-    type: 400gbase-x-qsfpp
+    type: 400gbase-x-qsfpdd
   - name: '{module}/0/10'
-    type: 400gbase-x-qsfpp
+    type: 400gbase-x-qsfpdd
   - name: '{module}/0/11'
-    type: 400gbase-x-qsfpp
+    type: 400gbase-x-qsfpdd
   - name: '{module}/0/12'
-    type: 400gbase-x-qsfpp
+    type: 400gbase-x-qsfpdd
   - name: '{module}/0/13'
-    type: 400gbase-x-qsfpp
+    type: 400gbase-x-qsfpdd
   - name: '{module}/0/14'
-    type: 400gbase-x-qsfpp
+    type: 400gbase-x-qsfpdd
   - name: '{module}/0/15'
-    type: 400gbase-x-qsfpp
+    type: 400gbase-x-qsfpdd
   - name: '{module}/0/16'
-    type: 400gbase-x-qsfpp
+    type: 400gbase-x-qsfpdd
   - name: '{module}/0/17'
-    type: 400gbase-x-qsfpp
+    type: 400gbase-x-qsfpdd
   - name: '{module}/0/18'
-    type: 400gbase-x-qsfpp
+    type: 400gbase-x-qsfpdd
   - name: '{module}/0/19'
-    type: 400gbase-x-qsfpp
+    type: 400gbase-x-qsfpdd
   - name: '{module}/0/20'
-    type: 400gbase-x-qsfpp
+    type: 400gbase-x-qsfpdd
   - name: '{module}/0/21'
-    type: 400gbase-x-qsfpp
+    type: 400gbase-x-qsfpdd
   - name: '{module}/0/22'
-    type: 400gbase-x-qsfpp
+    type: 400gbase-x-qsfpdd
   - name: '{module}/0/23'
-    type: 400gbase-x-qsfpp
+    type: 400gbase-x-qsfpdd
   - name: '{module}/0/24'
-    type: 400gbase-x-qsfpp
+    type: 400gbase-x-qsfpdd
   - name: '{module}/0/25'
-    type: 400gbase-x-qsfpp
+    type: 400gbase-x-qsfpdd
   - name: '{module}/0/26'
-    type: 400gbase-x-qsfpp
+    type: 400gbase-x-qsfpdd
   - name: '{module}/0/27'
-    type: 400gbase-x-qsfpp
+    type: 400gbase-x-qsfpdd
   - name: '{module}/0/28'
-    type: 400gbase-x-qsfpp
+    type: 400gbase-x-qsfpdd
   - name: '{module}/0/29'
-    type: 400gbase-x-qsfpp
+    type: 400gbase-x-qsfpdd
   - name: '{module}/0/30'
-    type: 400gbase-x-qsfpp
+    type: 400gbase-x-qsfpdd
   - name: '{module}/0/31'
-    type: 400gbase-x-qsfpp
+    type: 400gbase-x-qsfpdd
   - name: '{module}/0/32'
-    type: 400gbase-x-qsfpp
+    type: 400gbase-x-qsfpdd
   - name: '{module}/0/33'
-    type: 400gbase-x-qsfpp
+    type: 400gbase-x-qsfpdd
   - name: '{module}/0/34'
-    type: 400gbase-x-qsfpp
+    type: 400gbase-x-qsfpdd
   - name: '{module}/0/35'
-    type: 400gbase-x-qsfpp
+    type: 400gbase-x-qsfpdd
   - name: '{module}/0/36'
-    type: 400gbase-x-qsfpp
+    type: 400gbase-x-qsfpdd
diff --git a/module-types/Nokia/XCM2s-XMA2s-36-800G.yaml b/module-types/Nokia/XCM2s-XMA2s-36-800G.yaml
index 3f77bf8634c44b2122c0d50e86677fa7522f12fc..5435212979e1b3caba61bab42e8d0d9c23a1fd52 100644
--- a/module-types/Nokia/XCM2s-XMA2s-36-800G.yaml
+++ b/module-types/Nokia/XCM2s-XMA2s-36-800G.yaml
@@ -4,79 +4,75 @@ model: XCM2s-XMA2s-36p-800g
 part_number: 3HE17771AA
 comments: XMA2-s 36-port card with 12T licence inside XCM2-s
 interfaces:
-  - name: '{module}/2/1'
-    type: 800gbase-x-qsfpdd
-  - name: '{module}/2/2'
-    type: 10gbase-x-xfp
-  # - name: '{module}/0/1'
-  #   type: 800gbase-x-qsfpp
-  # # - name: '{module}/0/2'
-  #   type: 800gbase-x-qsfpp
-  # - name: '{module}/0/3'
-  #   type: 800gbase-x-qsfpp
-  # - name: '{module}/0/4'
-  #   type: 800gbase-x-qsfpp
-  # - name: '{module}/0/5'
-  #   type: 800gbase-x-qsfpp
-  # - name: '{module}/0/6'
-  #   type: 800gbase-x-qsfpp
-  # - name: '{module}/0/7'
-  #   type: 800gbase-x-qsfpp
-  # - name: '{module}/0/8'
-  #   type: 800gbase-x-qsfpp
-  # - name: '{module}/0/9'
-  #   type: 800gbase-x-qsfpp
-  # - name: '{module}/0/10'
-  #   type: 800gbase-x-qsfpp
-  # - name: '{module}/0/11'
-  #   type: 800gbase-x-qsfpp
-  # - name: '{module}/0/12'
-  #   type: 800gbase-x-qsfpp
-  # - name: '{module}/0/13'
-  #   type: 800gbase-x-qsfpp
-  # - name: '{module}/0/14'
-  #   type: 800gbase-x-qsfpp
-  # - name: '{module}/0/15'
-  #   type: 800gbase-x-qsfpp
-  # - name: '{module}/0/16'
-  #   type: 800gbase-x-qsfpp
-  # - name: '{module}/0/17'
-  #   type: 800gbase-x-qsfpp
-  # - name: '{module}/0/18'
-  #   type: 800gbase-x-qsfpp
-  # - name: '{module}/0/19'
-  #   type: 800gbase-x-qsfpp
-  # - name: '{module}/0/20'
-  #   type: 800gbase-x-qsfpp
-  # - name: '{module}/0/21'
-  #   type: 800gbase-x-qsfpp
-  # - name: '{module}/0/22'
-  #   type: 800gbase-x-qsfpp
-  # - name: '{module}/0/23'
-  #   type: 800gbase-x-qsfpp
-  # - name: '{module}/0/24'
-  #   type: 800gbase-x-qsfpp
-  # - name: '{module}/0/25'
-  #   type: 800gbase-x-qsfpp
-  # - name: '{module}/0/26'
-  #   type: 800gbase-x-qsfpp
-  # - name: '{module}/0/27'
-  #   type: 800gbase-x-qsfpp
-  # - name: '{module}/0/28'
-  #   type: 800gbase-x-qsfpp
-  # - name: '{module}/0/29'
-  #   type: 800gbase-x-qsfpp
-  # - name: '{module}/0/30'
-  #   type: 800gbase-x-qsfpp
-  # - name: '{module}/0/31'
-  #   type: 800gbase-x-qsfpp
-  # - name: '{module}/0/32'
-  #   type: 800gbase-x-qsfpp
-  # - name: '{module}/0/33'
-  #   type: 800gbase-x-qsfpp
-  # - name: '{module}/0/34'
-  #   type: 800gbase-x-qsfpp
-  # - name: '{module}/0/35'
-  #   type: 800gbase-x-qsfpp
-  # - name: '{module}/0/36'
-  #   type: 800gbase-x-qsfpp
+  - name: '{module}/0/1'
+    type: 800gbase-x-qsfpdd
+  - name: '{module}/0/2'
+    type: 800gbase-x-qsfpdd
+  - name: '{module}/0/3'
+    type: 800gbase-x-qsfpdd
+  - name: '{module}/0/4'
+    type: 800gbase-x-qsfpdd
+  - name: '{module}/0/5'
+    type: 800gbase-x-qsfpdd
+  - name: '{module}/0/6'
+    type: 800gbase-x-qsfpdd
+  - name: '{module}/0/7'
+    type: 800gbase-x-qsfpdd
+  - name: '{module}/0/8'
+    type: 800gbase-x-qsfpdd
+  - name: '{module}/0/9'
+    type: 800gbase-x-qsfpdd
+  - name: '{module}/0/10'
+    type: 800gbase-x-qsfpdd
+  - name: '{module}/0/11'
+    type: 800gbase-x-qsfpdd
+  - name: '{module}/0/12'
+    type: 800gbase-x-qsfpdd
+  - name: '{module}/0/13'
+    type: 800gbase-x-qsfpdd
+  - name: '{module}/0/14'
+    type: 800gbase-x-qsfpdd
+  - name: '{module}/0/15'
+    type: 800gbase-x-qsfpdd
+  - name: '{module}/0/16'
+    type: 800gbase-x-qsfpdd
+  - name: '{module}/0/17'
+    type: 800gbase-x-qsfpdd
+  - name: '{module}/0/18'
+    type: 800gbase-x-qsfpdd
+  - name: '{module}/0/19'
+    type: 800gbase-x-qsfpdd
+  - name: '{module}/0/20'
+    type: 800gbase-x-qsfpdd
+  - name: '{module}/0/21'
+    type: 800gbase-x-qsfpdd
+  - name: '{module}/0/22'
+    type: 800gbase-x-qsfpdd
+  - name: '{module}/0/23'
+    type: 800gbase-x-qsfpdd
+  - name: '{module}/0/24'
+    type: 800gbase-x-qsfpdd
+  - name: '{module}/0/25'
+    type: 800gbase-x-qsfpdd
+  - name: '{module}/0/26'
+    type: 800gbase-x-qsfpdd
+  - name: '{module}/0/27'
+    type: 800gbase-x-qsfpdd
+  - name: '{module}/0/28'
+    type: 800gbase-x-qsfpdd
+  - name: '{module}/0/29'
+    type: 800gbase-x-qsfpdd
+  - name: '{module}/0/30'
+    type: 800gbase-x-qsfpdd
+  - name: '{module}/0/31'
+    type: 800gbase-x-qsfpdd
+  - name: '{module}/0/32'
+    type: 800gbase-x-qsfpdd
+  - name: '{module}/0/33'
+    type: 800gbase-x-qsfpdd
+  - name: '{module}/0/34'
+    type: 800gbase-x-qsfpdd
+  - name: '{module}/0/35'
+    type: 800gbase-x-qsfpdd
+  - name: '{module}/0/36'
+    type: 800gbase-x-qsfpdd