diff --git a/dockers/docker-orchagent/switch.json.j2 b/dockers/docker-orchagent/switch.json.j2
index 65572cb5f669..4b75afa3c33d 100644
--- a/dockers/docker-orchagent/switch.json.j2
+++ b/dockers/docker-orchagent/switch.json.j2
@@ -20,9 +20,11 @@
 [
     {
         "SWITCH_TABLE:switch": {
-{% if "broadcom" not in asic_type and "marvell" not in asic_type %}
+{% if DEVICE_METADATA.localhost.type in ["ToRRouter", "LeafRouter"] %}
+{% if "broadcom" not in asic_type %}
             "vxlan_port": "{{ vxlan_port }}",
             "vxlan_router_mac": "{{ vxlan_mac }}",
+{% endif %}
 {% endif %}
             "ecmp_hash_seed": "{{ hash_seed_value }}",
             "lag_hash_seed": "{{ hash_seed_value }}",