diff --git a/geant/gap_ansible/roles/base_config/tasks/merge_variables.yaml b/geant/gap_ansible/roles/base_config/tasks/merge_variables.yaml
index f192b0fbc15a78f0a0536bee0d83ec65848bd81d..bcc03b89c1e77b9dcb887de8ea21ba414d2940a2 100644
--- a/geant/gap_ansible/roles/base_config/tasks/merge_variables.yaml
+++ b/geant/gap_ansible/roles/base_config/tasks/merge_variables.yaml
@@ -28,18 +28,22 @@
   ansible.builtin.set_fact:
     cpm_filters: "{{ lookup('community.general.merge_variables', 'cpmf__to_merge', pattern_type='suffix') }}"
 
-- name: Select the correct chassis config for SR7
+- name: Select the correct chassis and cards/ports onfig for SR7
   ansible.builtin.set_fact:
-    nokia_chassis: "{{sr7.nokia_chassis}}" 
-    nokia_power_safety_level: "{{sr7.nokia_power_safety_level}}" 
-    nokia_sfms: "{{sr7.nokia_sfms}}" 
+    nokia_chassis: "{{sr7_chassis.nokia_chassis}}" 
+    nokia_power_safety_level: "{{sr7_chassis.nokia_power_safety_level}}" 
+    nokia_sfms: "{{sr7_chassis.nokia_sfms}}" 
+    nokia_cards: "{{sr7_cards.nokia_cards}}"
+    nokia_xma2_connectors: "{{sr7_cards.nokia_xma2_connectors}}"
   when: wfo_router.router.router_site.site_tier = 1 or wfo_router.router.router_site.site_tier = 2 
 
-- name: Select the correct chassis config for SR2-se
+- name: Select the correct chassis and cards/ports config for SR2-se
   ansible.builtin.set_fact:
-    nokia_chassis: "{{sr2se.nokia_chassis}}" 
-    nokia_power_safety_level: "{{sr2se.nokia_power_safety_level}}" 
-    nokia_sfms: "{{sr2se.nokia_sfms}}" 
+    nokia_chassis: "{{sr2se_chassis.nokia_chassis}}" 
+    nokia_power_safety_level: "{{sr2se_chassis.nokia_power_safety_level}}" 
+    nokia_sfms: "{{sr2se_chassis.nokia_sfms}}" 
+    nokia_cards: "{{sr2se_cards.nokia_cards}}"
+    nokia_xma2_connectors: "{{sr2se_cards.nokia_xma2_connectors}}"
   when: wfo_router.router.router_site.site_tier = 3
 
 - name: Prepare PE-specific vars
diff --git a/geant/gap_ansible/roles/base_config/templates/routers/nokia/chassis_tier1.j2 b/geant/gap_ansible/roles/base_config/templates/routers/nokia/chassis_tier1.j2
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/geant/gap_ansible/roles/base_config/templates/routers/nokia/chassis_tier2.j2 b/geant/gap_ansible/roles/base_config/templates/routers/nokia/chassis_tier2.j2
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000