diff --git a/device/accton/x86_64-accton_wedge100bf_32qs-r0/montara/switch-tna-sai.conf b/device/accton/x86_64-accton_wedge100bf_32qs-r0/montara/switch-tna-sai.conf
index 4a4d41f380..8c34ef9d6a 100644
--- a/device/accton/x86_64-accton_wedge100bf_32qs-r0/montara/switch-tna-sai.conf
+++ b/device/accton/x86_64-accton_wedge100bf_32qs-r0/montara/switch-tna-sai.conf
@@ -1,17 +1,9 @@
 {
-    "instance": 0,
     "chip_list": [
         {
-            "id": "asic-0",
             "chip_family": "Tofino",
-            "instance": 0,
-            "pcie_sysfs_prefix": "/sys/devices/pci0000:00/0000:00:03.0/0000:05:00.0",
-            "pcie_domain": 0,
-            "pcie_bus": 5,
-            "pcie_fn": 0,
-            "pcie_dev": 0,
-            "pcie_int_mode": 1,
-            "sds_fw_path": "share/tofino_sds_fw/avago/firmware"
+            "sds_fw_path": "share/tofino_sds_fw/avago/firmware",
+            "instance": 0
         }
     ],
     "p4_devices": [
@@ -28,7 +20,6 @@
                         }
                     ],
                     "program-name": "switch",
-                    "sai": "lib/libsai.so",
                     "bfrt-config": "share/switch/bf-rt.json",
                     "model_json_path" : "share/switch/aug_model.json",
                     "switchapi_port_add": false,
@@ -36,5 +27,13 @@
                 }
             ]
         }
+    ],
+    "switch_options": [
+        {
+            "device-id": 0,
+            "model_json_path": "share/switch/aug_model.json",
+            "non_default_port_ppgs": 5,
+            "switchapi_port_add": false
+        }
     ]
 }
diff --git a/device/arista/x86_64-arista_7170_32c/Arista-7170-32C-C32/switch-sai.conf b/device/arista/x86_64-arista_7170_32c/Arista-7170-32C-C32/switch-sai.conf
deleted file mode 100644
index 0a807b1c9e..0000000000
--- a/device/arista/x86_64-arista_7170_32c/Arista-7170-32C-C32/switch-sai.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "chip_list": [
-        {
-            "id": "asic-0",
-            "chip_family": "Tofino",
-            "instance": 0,
-            "pcie_sysfs_prefix": "/sys/devices/pci0000:00/0000:00:1c.4/0000:07:00.0",
-            "pcie_domain": 0,
-            "pcie_bus": 7,
-            "pcie_fn": 0,
-            "pcie_dev": 0,
-            "pcie_int_mode": 1,
-            "sds_fw_path": "share/tofino_sds_fw/avago/firmware"
-        }
-    ],
-    "instance": 0,
-    "p4_program_list": [
-        {
-            "id": "pgm-0",
-            "instance": 0,
-            "path": "switch",
-            "program-name": "switch",
-            "pd": "lib/tofinopd/switch/libpd.so",
-            "pd-thrift": "lib/tofinopd/switch/libpdthrift.so",
-            "table-config": "share/tofinopd/switch/context.json",
-            "tofino-bin": "share/tofinopd/switch/tofino.bin",
-            "switchapi": "lib/libswitchapi.so",
-            "sai": "lib/libsai.so",
-            "switchapi_port_add": false,
-            "non_default_port_ppgs": 5
-        }
-    ]
-}
diff --git a/device/arista/x86_64-arista_7170_32c/Arista-7170-32C-C32/switch-tna-sai.conf b/device/arista/x86_64-arista_7170_32c/Arista-7170-32C-C32/switch-tna-sai.conf
index ece3fcbe6a..dc8c82ce25 100644
--- a/device/arista/x86_64-arista_7170_32c/Arista-7170-32C-C32/switch-tna-sai.conf
+++ b/device/arista/x86_64-arista_7170_32c/Arista-7170-32C-C32/switch-tna-sai.conf
@@ -1,16 +1,8 @@
 {
-    "instance": 0,
     "chip_list": [
         {
-            "id": "asic-0",
             "chip_family": "Tofino",
             "instance": 0,
-            "pcie_sysfs_prefix": "/sys/devices/pci0000:00/0000:00:03.0/0000:05:00.0",
-            "pcie_domain": 0,
-            "pcie_bus": 5,
-            "pcie_fn": 0,
-            "pcie_dev": 0,
-            "pcie_int_mode": 1,
             "sds_fw_path": "share/tofino_sds_fw/avago/firmware"
         }
     ],
@@ -27,7 +19,6 @@
                         }
                     ],
                     "program-name": "switch",
-                    "sai": "lib/libsai.so",
                     "bfrt-config": "share/switch/bf-rt.json",
                     "model_json_path" : "share/switch/aug_model.json",
                     "switchapi_port_add": false,
@@ -35,5 +26,13 @@
                 }
             ]
         }
+    ],
+    "switch_options": [
+        {
+            "device-id": 0,
+            "model_json_path": "share/switch/aug_model.json",
+            "non_default_port_ppgs": 5,
+            "switchapi_port_add": false
+        }
     ]
 }
diff --git a/device/arista/x86_64-arista_7170_32cd/Arista-7170-32CD-C32/switch-sai.conf b/device/arista/x86_64-arista_7170_32cd/Arista-7170-32CD-C32/switch-sai.conf
deleted file mode 100644
index 0a807b1c9e..0000000000
--- a/device/arista/x86_64-arista_7170_32cd/Arista-7170-32CD-C32/switch-sai.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "chip_list": [
-        {
-            "id": "asic-0",
-            "chip_family": "Tofino",
-            "instance": 0,
-            "pcie_sysfs_prefix": "/sys/devices/pci0000:00/0000:00:1c.4/0000:07:00.0",
-            "pcie_domain": 0,
-            "pcie_bus": 7,
-            "pcie_fn": 0,
-            "pcie_dev": 0,
-            "pcie_int_mode": 1,
-            "sds_fw_path": "share/tofino_sds_fw/avago/firmware"
-        }
-    ],
-    "instance": 0,
-    "p4_program_list": [
-        {
-            "id": "pgm-0",
-            "instance": 0,
-            "path": "switch",
-            "program-name": "switch",
-            "pd": "lib/tofinopd/switch/libpd.so",
-            "pd-thrift": "lib/tofinopd/switch/libpdthrift.so",
-            "table-config": "share/tofinopd/switch/context.json",
-            "tofino-bin": "share/tofinopd/switch/tofino.bin",
-            "switchapi": "lib/libswitchapi.so",
-            "sai": "lib/libsai.so",
-            "switchapi_port_add": false,
-            "non_default_port_ppgs": 5
-        }
-    ]
-}
diff --git a/device/arista/x86_64-arista_7170_32cd/Arista-7170-32CD-C32/switch-tna-sai.conf b/device/arista/x86_64-arista_7170_32cd/Arista-7170-32CD-C32/switch-tna-sai.conf
index ece3fcbe6a..dc8c82ce25 100644
--- a/device/arista/x86_64-arista_7170_32cd/Arista-7170-32CD-C32/switch-tna-sai.conf
+++ b/device/arista/x86_64-arista_7170_32cd/Arista-7170-32CD-C32/switch-tna-sai.conf
@@ -1,16 +1,8 @@
 {
-    "instance": 0,
     "chip_list": [
         {
-            "id": "asic-0",
             "chip_family": "Tofino",
             "instance": 0,
-            "pcie_sysfs_prefix": "/sys/devices/pci0000:00/0000:00:03.0/0000:05:00.0",
-            "pcie_domain": 0,
-            "pcie_bus": 5,
-            "pcie_fn": 0,
-            "pcie_dev": 0,
-            "pcie_int_mode": 1,
             "sds_fw_path": "share/tofino_sds_fw/avago/firmware"
         }
     ],
@@ -27,7 +19,6 @@
                         }
                     ],
                     "program-name": "switch",
-                    "sai": "lib/libsai.so",
                     "bfrt-config": "share/switch/bf-rt.json",
                     "model_json_path" : "share/switch/aug_model.json",
                     "switchapi_port_add": false,
@@ -35,5 +26,13 @@
                 }
             ]
         }
+    ],
+    "switch_options": [
+        {
+            "device-id": 0,
+            "model_json_path": "share/switch/aug_model.json",
+            "non_default_port_ppgs": 5,
+            "switchapi_port_add": false
+        }
     ]
 }
diff --git a/device/arista/x86_64-arista_7170_64c/Arista-7170-64C/switch-sai.conf b/device/arista/x86_64-arista_7170_64c/Arista-7170-64C/switch-sai.conf
deleted file mode 100644
index 0a807b1c9e..0000000000
--- a/device/arista/x86_64-arista_7170_64c/Arista-7170-64C/switch-sai.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "chip_list": [
-        {
-            "id": "asic-0",
-            "chip_family": "Tofino",
-            "instance": 0,
-            "pcie_sysfs_prefix": "/sys/devices/pci0000:00/0000:00:1c.4/0000:07:00.0",
-            "pcie_domain": 0,
-            "pcie_bus": 7,
-            "pcie_fn": 0,
-            "pcie_dev": 0,
-            "pcie_int_mode": 1,
-            "sds_fw_path": "share/tofino_sds_fw/avago/firmware"
-        }
-    ],
-    "instance": 0,
-    "p4_program_list": [
-        {
-            "id": "pgm-0",
-            "instance": 0,
-            "path": "switch",
-            "program-name": "switch",
-            "pd": "lib/tofinopd/switch/libpd.so",
-            "pd-thrift": "lib/tofinopd/switch/libpdthrift.so",
-            "table-config": "share/tofinopd/switch/context.json",
-            "tofino-bin": "share/tofinopd/switch/tofino.bin",
-            "switchapi": "lib/libswitchapi.so",
-            "sai": "lib/libsai.so",
-            "switchapi_port_add": false,
-            "non_default_port_ppgs": 5
-        }
-    ]
-}
diff --git a/device/arista/x86_64-arista_7170_64c/Arista-7170-64C/switch-tna-sai.conf b/device/arista/x86_64-arista_7170_64c/Arista-7170-64C/switch-tna-sai.conf
index ece3fcbe6a..dc8c82ce25 100644
--- a/device/arista/x86_64-arista_7170_64c/Arista-7170-64C/switch-tna-sai.conf
+++ b/device/arista/x86_64-arista_7170_64c/Arista-7170-64C/switch-tna-sai.conf
@@ -1,16 +1,8 @@
 {
-    "instance": 0,
     "chip_list": [
         {
-            "id": "asic-0",
             "chip_family": "Tofino",
             "instance": 0,
-            "pcie_sysfs_prefix": "/sys/devices/pci0000:00/0000:00:03.0/0000:05:00.0",
-            "pcie_domain": 0,
-            "pcie_bus": 5,
-            "pcie_fn": 0,
-            "pcie_dev": 0,
-            "pcie_int_mode": 1,
             "sds_fw_path": "share/tofino_sds_fw/avago/firmware"
         }
     ],
@@ -27,7 +19,6 @@
                         }
                     ],
                     "program-name": "switch",
-                    "sai": "lib/libsai.so",
                     "bfrt-config": "share/switch/bf-rt.json",
                     "model_json_path" : "share/switch/aug_model.json",
                     "switchapi_port_add": false,
@@ -35,5 +26,13 @@
                 }
             ]
         }
+    ],
+    "switch_options": [
+        {
+            "device-id": 0,
+            "model_json_path": "share/switch/aug_model.json",
+            "non_default_port_ppgs": 5,
+            "switchapi_port_add": false
+        }
     ]
 }
diff --git a/device/arista/x86_64-arista_7170_64c/Arista-7170-Q59S20/switch-sai.conf b/device/arista/x86_64-arista_7170_64c/Arista-7170-Q59S20/switch-sai.conf
deleted file mode 100644
index 0a807b1c9e..0000000000
--- a/device/arista/x86_64-arista_7170_64c/Arista-7170-Q59S20/switch-sai.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "chip_list": [
-        {
-            "id": "asic-0",
-            "chip_family": "Tofino",
-            "instance": 0,
-            "pcie_sysfs_prefix": "/sys/devices/pci0000:00/0000:00:1c.4/0000:07:00.0",
-            "pcie_domain": 0,
-            "pcie_bus": 7,
-            "pcie_fn": 0,
-            "pcie_dev": 0,
-            "pcie_int_mode": 1,
-            "sds_fw_path": "share/tofino_sds_fw/avago/firmware"
-        }
-    ],
-    "instance": 0,
-    "p4_program_list": [
-        {
-            "id": "pgm-0",
-            "instance": 0,
-            "path": "switch",
-            "program-name": "switch",
-            "pd": "lib/tofinopd/switch/libpd.so",
-            "pd-thrift": "lib/tofinopd/switch/libpdthrift.so",
-            "table-config": "share/tofinopd/switch/context.json",
-            "tofino-bin": "share/tofinopd/switch/tofino.bin",
-            "switchapi": "lib/libswitchapi.so",
-            "sai": "lib/libsai.so",
-            "switchapi_port_add": false,
-            "non_default_port_ppgs": 5
-        }
-    ]
-}
diff --git a/device/arista/x86_64-arista_7170_64c/Arista-7170-Q59S20/switch-tna-sai.conf b/device/arista/x86_64-arista_7170_64c/Arista-7170-Q59S20/switch-tna-sai.conf
index ece3fcbe6a..dc8c82ce25 100644
--- a/device/arista/x86_64-arista_7170_64c/Arista-7170-Q59S20/switch-tna-sai.conf
+++ b/device/arista/x86_64-arista_7170_64c/Arista-7170-Q59S20/switch-tna-sai.conf
@@ -1,16 +1,8 @@
 {
-    "instance": 0,
     "chip_list": [
         {
-            "id": "asic-0",
             "chip_family": "Tofino",
             "instance": 0,
-            "pcie_sysfs_prefix": "/sys/devices/pci0000:00/0000:00:03.0/0000:05:00.0",
-            "pcie_domain": 0,
-            "pcie_bus": 5,
-            "pcie_fn": 0,
-            "pcie_dev": 0,
-            "pcie_int_mode": 1,
             "sds_fw_path": "share/tofino_sds_fw/avago/firmware"
         }
     ],
@@ -27,7 +19,6 @@
                         }
                     ],
                     "program-name": "switch",
-                    "sai": "lib/libsai.so",
                     "bfrt-config": "share/switch/bf-rt.json",
                     "model_json_path" : "share/switch/aug_model.json",
                     "switchapi_port_add": false,
@@ -35,5 +26,13 @@
                 }
             ]
         }
+    ],
+    "switch_options": [
+        {
+            "device-id": 0,
+            "model_json_path": "share/switch/aug_model.json",
+            "non_default_port_ppgs": 5,
+            "switchapi_port_add": false
+        }
     ]
 }
diff --git a/device/barefoot/x86_64-accton_as9516_32d-r0/newport/switch-tna-sai.conf b/device/barefoot/x86_64-accton_as9516_32d-r0/newport/switch-tna-sai.conf
index cf6e445dba..2789eb0e2c 100644
--- a/device/barefoot/x86_64-accton_as9516_32d-r0/newport/switch-tna-sai.conf
+++ b/device/barefoot/x86_64-accton_as9516_32d-r0/newport/switch-tna-sai.conf
@@ -1,17 +1,9 @@
 {
-    "instance": 0,
     "chip_list": [
         {
-            "id": "asic-0",
             "chip_family": "Tofino2",
-            "instance": 0,
-            "pcie_sysfs_prefix": "/sys/devices/pci0000:00/0000:00:03.0/0000:05:00.0",
-            "pcie_domain": 0,
-            "pcie_bus": 5,
-            "pcie_fn": 0,
-            "pcie_dev": 0,
-            "pcie_int_mode": 1,
-            "sds_fw_path": "share/tofino_sds_fw/avago/firmware"
+            "sds_fw_path": "share/tofino_sds_fw/avago/firmware",
+            "instance": 0
         }
     ],
     "p4_devices": [
@@ -20,21 +12,28 @@
             "agent0": "lib/platform/x86_64-accton_as9516bf_32d-r0/libpltfm_mgr.so",
             "p4_programs": [
                 {
+                    "program-name": "switch",
+                    "bfrt-config": "share/switch/bf-rt.json",
                     "p4_pipelines": [
                         {
                             "p4_pipeline_name": "pipe",
                             "config": "share/switch/pipe/tofino2.bin",
                             "context": "share/switch/pipe/context.json"
                         }
-                    ],
-                    "program-name": "switch",
-                    "sai": "lib/libsai.so",
-                    "bfrt-config": "share/switch/bf-rt.json",
+                    ],                   
                     "model_json_path" : "share/switch/aug_model.json",
                     "switchapi_port_add": false,
                     "non_default_port_ppgs": 5
                 }
             ]
         }
+    ],
+    "switch_options": [
+        {
+            "device-id": 0,
+            "model_json_path": "share/switch/aug_model.json",
+            "non_default_port_ppgs": 5,
+            "switchapi_port_add": false
+        }
     ]
 }
diff --git a/device/barefoot/x86_64-accton_wedge100bf_32x-r0/montara/switch-sai.conf b/device/barefoot/x86_64-accton_wedge100bf_32x-r0/montara/switch-sai.conf
deleted file mode 100644
index fc224c9602..0000000000
--- a/device/barefoot/x86_64-accton_wedge100bf_32x-r0/montara/switch-sai.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "chip_list": [
-        {
-            "id": "asic-0",
-            "chip_family": "Tofino",
-            "instance": 0,
-            "pcie_sysfs_prefix": "/sys/devices/pci0000:00/0000:00:03.0/0000:05:00.0",
-            "pcie_domain": 0,
-            "pcie_bus": 5,
-            "pcie_fn": 0,
-            "pcie_dev": 0,
-            "pcie_int_mode": 1,
-            "sds_fw_path": "share/tofino_sds_fw/avago/firmware"
-        }
-    ],
-    "instance": 0,
-    "p4_program_list": [
-        {
-            "id": "pgm-0",
-            "instance": 0,
-            "path": "switch",
-            "program-name": "switch",
-            "pd": "lib/tofinopd/switch/libpd.so",
-            "pd-thrift": "lib/tofinopd/switch/libpdthrift.so",
-            "table-config": "share/tofinopd/switch/context.json",
-            "tofino-bin": "share/tofinopd/switch/tofino.bin",
-            "switchapi": "lib/libswitchapi.so",
-            "sai": "lib/libsai.so",
-            "agent0": "lib/platform/x86_64-accton_wedge100bf_32x-r0/libpltfm_mgr.so",
-            "switchapi_port_add": false,
-            "non_default_port_ppgs": 5
-        }
-    ]
-}
diff --git a/device/barefoot/x86_64-accton_wedge100bf_32x-r0/montara/switch-tna-sai.conf b/device/barefoot/x86_64-accton_wedge100bf_32x-r0/montara/switch-tna-sai.conf
index 085a1b8dcd..dc6f78e0b1 100644
--- a/device/barefoot/x86_64-accton_wedge100bf_32x-r0/montara/switch-tna-sai.conf
+++ b/device/barefoot/x86_64-accton_wedge100bf_32x-r0/montara/switch-tna-sai.conf
@@ -1,17 +1,9 @@
 {
-    "instance": 0,
     "chip_list": [
         {
-            "id": "asic-0",
             "chip_family": "Tofino",
-            "instance": 0,
-            "pcie_sysfs_prefix": "/sys/devices/pci0000:00/0000:00:03.0/0000:05:00.0",
-            "pcie_domain": 0,
-            "pcie_bus": 5,
-            "pcie_fn": 0,
-            "pcie_dev": 0,
-            "pcie_int_mode": 1,
-            "sds_fw_path": "share/tofino_sds_fw/avago/firmware"
+            "sds_fw_path": "share/tofino_sds_fw/avago/firmware",
+            "instance": 0
         }
     ],
     "p4_devices": [
@@ -28,7 +20,6 @@
                         }
                     ],
                     "program-name": "switch",
-                    "sai": "lib/libsai.so",
                     "bfrt-config": "share/switch/bf-rt.json",
                     "model_json_path" : "share/switch/aug_model.json",
                     "switchapi_port_add": false,
@@ -36,5 +27,13 @@
                 }
             ]
         }
+    ],
+    "switch_options": [
+        {
+            "device-id": 0,
+            "model_json_path": "share/switch/aug_model.json",
+            "non_default_port_ppgs": 5,
+            "switchapi_port_add": false
+        }
     ]
 }
diff --git a/device/barefoot/x86_64-accton_wedge100bf_65x-r0/mavericks/switch-sai.conf b/device/barefoot/x86_64-accton_wedge100bf_65x-r0/mavericks/switch-sai.conf
deleted file mode 100644
index 81a7d7bc28..0000000000
--- a/device/barefoot/x86_64-accton_wedge100bf_65x-r0/mavericks/switch-sai.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "chip_list": [
-        {
-            "id": "asic-0",
-            "chip_family": "Tofino",
-            "instance": 0,
-            "pcie_sysfs_prefix": "/sys/devices/pci0000:00/0000:00:03.0/0000:05:00.0",
-            "pcie_domain": 0,
-            "pcie_bus": 5,
-            "pcie_fn": 0,
-            "pcie_dev": 0,
-            "pcie_int_mode": 1,
-            "sds_fw_path": "share/tofino_sds_fw/avago/firmware"
-        }
-    ],
-    "instance": 0,
-    "p4_program_list": [
-        {
-            "id": "pgm-0",
-            "instance": 0,
-            "path": "switch",
-            "program-name": "switch",
-            "pd": "lib/tofinopd/switch/libpd.so",
-            "pd-thrift": "lib/tofinopd/switch/libpdthrift.so",
-            "table-config": "share/tofinopd/switch/context.json",
-            "tofino-bin": "share/tofinopd/switch/tofino.bin",
-            "switchapi": "lib/libswitchapi.so",
-            "sai": "lib/libsai.so",
-            "agent0": "lib/platform/x86_64-accton_wedge100bf_65x-r0/libpltfm_mgr.so",
-            "switchapi_port_add": false,
-            "non_default_port_ppgs": 5
-        }
-    ]
-}
diff --git a/device/barefoot/x86_64-accton_wedge100bf_65x-r0/mavericks/switch-tna-sai.conf b/device/barefoot/x86_64-accton_wedge100bf_65x-r0/mavericks/switch-tna-sai.conf
index ddcb9d4ba2..e07192619a 100644
--- a/device/barefoot/x86_64-accton_wedge100bf_65x-r0/mavericks/switch-tna-sai.conf
+++ b/device/barefoot/x86_64-accton_wedge100bf_65x-r0/mavericks/switch-tna-sai.conf
@@ -1,17 +1,9 @@
 {
-    "instance": 0,
     "chip_list": [
         {
-            "id": "asic-0",
             "chip_family": "Tofino",
-            "instance": 0,
-            "pcie_sysfs_prefix": "/sys/devices/pci0000:00/0000:00:03.0/0000:05:00.0",
-            "pcie_domain": 0,
-            "pcie_bus": 5,
-            "pcie_fn": 0,
-            "pcie_dev": 0,
-            "pcie_int_mode": 1,
-            "sds_fw_path": "share/tofino_sds_fw/avago/firmware"
+            "sds_fw_path": "share/tofino_sds_fw/avago/firmware",
+            "instance": 0
         }
     ],
     "p4_devices": [
@@ -28,7 +20,6 @@
                         }
                     ],
                     "program-name": "switch",
-                    "sai": "lib/libsai.so",
                     "bfrt-config": "share/switch/bf-rt.json",
                     "model_json_path" : "share/switch/aug_model.json",
                     "switchapi_port_add": false,
@@ -36,5 +27,13 @@
                 }
             ]
         }
+    ],
+    "switch_options": [
+        {
+            "device-id": 0,
+            "model_json_path": "share/switch/aug_model.json",
+            "non_default_port_ppgs": 5,
+            "switchapi_port_add": false
+        }
     ]
 }
diff --git a/device/ingrasys/x86_64-ingrasys_s9180_32x-r0/INGRASYS-S9180-32X/switch-tna-sai.conf b/device/ingrasys/x86_64-ingrasys_s9180_32x-r0/INGRASYS-S9180-32X/switch-tna-sai.conf
index 9fbf9d3cdb..193dcde96b 100644
--- a/device/ingrasys/x86_64-ingrasys_s9180_32x-r0/INGRASYS-S9180-32X/switch-tna-sai.conf
+++ b/device/ingrasys/x86_64-ingrasys_s9180_32x-r0/INGRASYS-S9180-32X/switch-tna-sai.conf
@@ -1,17 +1,9 @@
 {
-    "instance": 0,
     "chip_list": [
         {
-            "id": "asic-0",
             "chip_family": "Tofino",
-            "instance": 0,
-            "pcie_sysfs_prefix": "/sys/devices/pci0000:00/0000:00:03.0/0000:05:00.0",
-            "pcie_domain": 0,
-            "pcie_bus": 5,
-            "pcie_fn": 0,
-            "pcie_dev": 0,
-            "pcie_int_mode": 1,
-            "sds_fw_path": "share/tofino_sds_fw/avago/firmware"
+            "sds_fw_path": "share/tofino_sds_fw/avago/firmware",
+            "instance": 0
         }
     ],
     "p4_devices": [
@@ -28,7 +20,6 @@
                         }
                     ],
                     "program-name": "switch",
-                    "sai": "lib/libsai.so",
                     "bfrt-config": "share/switch/bf-rt.json",
                     "model_json_path" : "share/switch/aug_model.json",
                     "switchapi_port_add": false,
@@ -36,5 +27,13 @@
                 }
             ]
         }
+    ],
+    "switch_options": [
+        {
+            "device-id": 0,
+            "model_json_path": "share/switch/aug_model.json",
+            "non_default_port_ppgs": 5,
+            "switchapi_port_add": false
+        }
     ]
 }
diff --git a/device/ingrasys/x86_64-ingrasys_s9280_64x-r0/INGRASYS-S9280-64X/switch-tna-sai.conf b/device/ingrasys/x86_64-ingrasys_s9280_64x-r0/INGRASYS-S9280-64X/switch-tna-sai.conf
index 4895ac901f..2425102e23 100644
--- a/device/ingrasys/x86_64-ingrasys_s9280_64x-r0/INGRASYS-S9280-64X/switch-tna-sai.conf
+++ b/device/ingrasys/x86_64-ingrasys_s9280_64x-r0/INGRASYS-S9280-64X/switch-tna-sai.conf
@@ -1,17 +1,9 @@
 {
-    "instance": 0,
     "chip_list": [
         {
-            "id": "asic-0",
             "chip_family": "Tofino",
-            "instance": 0,
-            "pcie_sysfs_prefix": "/sys/devices/pci0000:00/0000:00:03.0/0000:05:00.0",
-            "pcie_domain": 0,
-            "pcie_bus": 5,
-            "pcie_fn": 0,
-            "pcie_dev": 0,
-            "pcie_int_mode": 1,
-            "sds_fw_path": "share/tofino_sds_fw/avago/firmware"
+            "sds_fw_path": "share/tofino_sds_fw/avago/firmware",
+            "instance": 0
         }
     ],
     "p4_devices": [
@@ -28,7 +20,6 @@
                         }
                     ],
                     "program-name": "switch",
-                    "sai": "lib/libsai.so",
                     "bfrt-config": "share/switch/bf-rt.json",
                     "model_json_path" : "share/switch/aug_model.json",
                     "switchapi_port_add": false,
@@ -36,5 +27,13 @@
                 }
             ]
         }
+    ],
+    "switch_options": [
+        {
+            "device-id": 0,
+            "model_json_path": "share/switch/aug_model.json",
+            "non_default_port_ppgs": 5,
+            "switchapi_port_add": false
+        }
     ]
 }
diff --git a/device/wnc/x86_64-wnc_osw1800-r0/OSW1800-48x6q/switch-tna-sai.conf b/device/wnc/x86_64-wnc_osw1800-r0/OSW1800-48x6q/switch-tna-sai.conf
index 7cb3ddc48f..03b0924d43 100644
--- a/device/wnc/x86_64-wnc_osw1800-r0/OSW1800-48x6q/switch-tna-sai.conf
+++ b/device/wnc/x86_64-wnc_osw1800-r0/OSW1800-48x6q/switch-tna-sai.conf
@@ -1,17 +1,9 @@
 {
-    "instance": 0,
     "chip_list": [
         {
-            "id": "asic-0",
             "chip_family": "Tofino",
-            "instance": 0,
-            "pcie_sysfs_prefix": "/sys/devices/pci0000:00/0000:00:03.0/0000:05:00.0",
-            "pcie_domain": 0,
-            "pcie_bus": 5,
-            "pcie_fn": 0,
-            "pcie_dev": 0,
-            "pcie_int_mode": 1,
-            "sds_fw_path": "share/tofino_sds_fw/avago/firmware"
+            "sds_fw_path": "share/tofino_sds_fw/avago/firmware",
+            "instance": 0
         }
     ],
     "p4_devices": [
@@ -28,7 +20,6 @@
                         }
                     ],
                     "program-name": "switch",
-                    "sai": "lib/libsai.so",
                     "bfrt-config": "share/switch/bf-rt.json",
                     "model_json_path" : "share/switch/aug_model.json",
                     "switchapi_port_add": false,
@@ -36,5 +27,13 @@
                 }
             ]
         }
+    ],
+    "switch_options": [
+        {
+            "device-id": 0,
+            "model_json_path": "share/switch/aug_model.json",
+            "non_default_port_ppgs": 5,
+            "switchapi_port_add": false
+        }
     ]
 }