diff --git a/partition/roles/sonic/defaults/main.yaml b/partition/roles/sonic/defaults/main.yaml
index 93f7be59..1506557c 100644
--- a/partition/roles/sonic/defaults/main.yaml
+++ b/partition/roles/sonic/defaults/main.yaml
@@ -11,9 +11,12 @@ sonic_ports: []
 sonic_ports_dict: {}
 sonic_ports_default_fec: none
 
+## Layer 2
+sonic_portchannels: []
+
 ## BGP related settings
 sonic_loopback_address:
-sonic_asn: 
+sonic_asn:
 sonic_bgp_ports: []
 sonic_frr_render: true
 sonic_frr_debug_options: []
diff --git a/partition/roles/sonic/templates/metal.yaml.j2 b/partition/roles/sonic/templates/metal.yaml.j2
index 9102bc71..64c05914 100644
--- a/partition/roles/sonic/templates/metal.yaml.j2
+++ b/partition/roles/sonic/templates/metal.yaml.j2
@@ -117,7 +117,7 @@ PORT:
     speed: "{{ running_cfg.speed }}"
     {% endif %}
   {% endfor %}
-{% if sonic_portchannels is defined and sonic_portchannels|length > 0 %}
+{% if sonic_portchannels %}
 
 PORTCHANNEL:
 {% for po in sonic_portchannels %}