diff --git a/deploy_partition.yaml b/deploy_partition.yaml
index 58bcefca..58c8b6a4 100644
--- a/deploy_partition.yaml
+++ b/deploy_partition.yaml
@@ -11,7 +11,7 @@
   roles:
     - name: ansible-common
       tags: always
-    - name: metal-roles/partition/roles/sonic
+    - name: metal-roles/partition/roles/sonic-config
       tags: sonic
     - name: sonic
       tags: sonic
diff --git a/files/ssh/config b/files/ssh/config
index ba8bb7ba..f8e20889 100644
--- a/files/ssh/config
+++ b/files/ssh/config
@@ -4,6 +4,7 @@ Host leaf*
 Host *
     User metal
     IdentityFile files/ssh/id_rsa
+    IdentitiesOnly yes
     PasswordAuthentication no
     StrictHostKeyChecking no
     UserKnownHostsFile /dev/null
diff --git a/inventories/group_vars/all/release_vector.yaml b/inventories/group_vars/all/release_vector.yaml
index 5ca134c2..a66214d0 100644
--- a/inventories/group_vars/all/release_vector.yaml
+++ b/inventories/group_vars/all/release_vector.yaml
@@ -29,6 +29,8 @@ metal_stack_release_vectors:
 # headscale_db_backup_restore_sidecar_image_name:
 # headscale_db_image_tag: 17-alpine
 # headscale_db_image_name: postgres
+# sonic_configdb_utils_image_name:
+# sonic_configdb_utils_image_tag:
 # ...
 #
 
diff --git a/inventories/group_vars/leaves/main.yaml b/inventories/group_vars/leaves/main.yaml
index cc36a1e6..79e2bdcc 100644
--- a/inventories/group_vars/leaves/main.yaml
+++ b/inventories/group_vars/leaves/main.yaml
@@ -5,26 +5,22 @@ dhcp_listening_interfaces:
 metal_core_spine_uplinks:
   - Ethernet120
 
-sonic_docker_routing_config_mode: split-unified
-sonic_frr_mgmt_framework_config: false
-sonic_frr_render: false
+sonic_config_docker_routing_config_mode: split-unified
+sonic_config_frr_render: false
 
-sonic_loopback_address: "{{ lo }}"
-sonic_mgmtif_ip: "{{ ansible_host }}/16`"
-sonic_mgmtif_gateway: "172.17.0.1"
+sonic_config_loopback_address: "{{ lo }}"
+sonic_config_mgmt_interface:
+  ip: "{{ ansible_host }}/16`"
+  gateway_address: "172.17.0.1"
 
-sonic_mgmt_vrf: false
+sonic_config_mgmt_vrf: false
+sonic_config_nameservers: "{{ router_nameservers }}"
 
-sonic_nameservers: "{{ router_nameservers }}"
-
-sonic_vlans:
+sonic_config_vlans:
   - id: 4000
     ip: "{{ metal_core_cidr }}"
 
-# Dummy VTEP so that basic VXLAN config will be deployed by sonic role:
-sonic_vteps:
-- comment: Dummy
-  vlan: Vlan3999
-  vni: 103999
+sonic_config_vtep:
+  enabled: true
 
 metal_core_cidr_mask: 25