diff --git a/partition/roles/sonic/templates/metal.yaml.j2 b/partition/roles/sonic/templates/metal.yaml.j2
index 975608e46..90b4834b4 100644
--- a/partition/roles/sonic/templates/metal.yaml.j2
+++ b/partition/roles/sonic/templates/metal.yaml.j2
@@ -82,14 +82,14 @@ PORT:
     index: "{{ cfg.index }}"
     lanes: "{{ cfg.lanes }}"
     parent_port: {{ cfg.parent_port }}
-    {% if sonic_ports[name] is defined %}
     admin_status: up
+    {% if sonic_ports[name] is defined %}
     speed: "{{ sonic_ports[name].speed|default(cfg.speed) }}"
     mtu: "{{ sonic_ports[name].mtu|default(sonic_ports_default_mtu) }}"
     fec: "{{ sonic_ports[name].fec|default(sonic_ports_default_fec)|string|lower }}"
     {% else %}
     speed: "{{ cfg.speed }}"
-    mtu: "{{ sonic_ports_default_mtu }}"
+    mtu: "{{ cfg.mtu }}"
     fec: "{{ sonic_ports_default_fec|string|lower }}"
     {% endif %}
   {% endfor %}
@@ -101,7 +101,7 @@ VLAN:
     {% if vlan.dhcp_servers is defined and vlan.dhcp_servers|length > 0 %}
     dhcp_servers: {{ vlan.dhcp_servers }}
     {% endif %}
-    vlanid: {{ vlan.id }}
+    vlanid: {{ vlan.id | string }}
   {% endfor %}
 
 VLAN_INTERFACE: