diff --git a/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/buffers.json.j2 b/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/buffers.json.j2
index 560cae5dd1b4..b12fc3851177 100644
--- a/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/buffers.json.j2
+++ b/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/buffers.json.j2
@@ -1,7 +1,7 @@
 {# Default values which will be used if no actual configura available #}
 {% set default_cable = '300m' %}
 {% set default_speed = '100G' %}
-{% set default_ports_num = 32 -%}
+{% set default_ports_num = 64 -%}
 
 {# Port configuration to cable length look-up table #}
 {# Each record describes mapping of DUT (DUT port) role and neighbor role to cable length #}
@@ -47,7 +47,7 @@
 {% if PORT is not defined %}
     {% set PORT = [] %}
     {% for port_idx in range(0,default_ports_num) %}
-        {% if PORT.append("Ethernet%d" % (port_idx*4)) %}{% endif %}
+        {% if PORT.append("Ethernet%d" % port_idx) %}{% endif %}
     {% endfor %}
 {% endif -%}
 
@@ -68,47 +68,40 @@
     }
     },
     "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "7274496",
+        "ingress_lossless_lossy_pool": {
+            "size": "10443264",
             "type": "ingress",
-            "mode": "static"
+            "mode": "dynamic",
+            "xoff": "4625920"
         },
-        "ingress_lossy_pool": {
-            "size": "5491712",
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool0": {
-            "size": "3637248",
+        "egress_lossy_pool": {
+            "size": "8877440",
             "type": "egress",
-            "mode": "static"
+            "mode": "dynamic"
         },
-        "egress_lossless_pool1": {
-            "size": "3637248",
+        "egress_lossless_pool": {
+            "size": "15982592",
             "type": "egress",
             "mode": "static"
-        },
-        "egress_lossy_pool": {
-            "size": "5491712",
-            "type": "egress",
-            "mode": "dynamic"
         }
     },
     "BUFFER_PROFILE": {
+        "ingress_lossless_profile": {
+            "pool": "[BUFFER_POOL|ingress_lossless_lossy_pool]",
+            "xon": "4096",
+            "xoff": "58448",
+            "size": "1248",
+            "dynamic_th": "-4"
+        },
         "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossy_pool]",
-            "size":"1518",
+            "pool":"[BUFFER_POOL|ingress_lossless_lossy_pool]",
+            "size":"0",
             "dynamic_th":"3"
         },
-        "egress_lossless_profile0": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool0]",
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
             "size":"1518",
-            "static_th":"3637248"
-        },
-        "egress_lossless_profile1": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool1]",
-            "size":"1518",
-            "static_th":"3637248"
+            "static_th":"3995648"
         },
         "egress_lossy_profile": {
             "pool":"[BUFFER_POOL|egress_lossy_pool]",
@@ -117,18 +110,16 @@
         }
     },
     "BUFFER_PG": {
-        "{{ port_names }}|0-1": {
+        "{{ port_names }}:3-4": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+        },
+        "{{ port_names }}:0-1": {
             "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
-        }
-    },
-    "BUFFER_QUEUE": {
-        "{{ port_names }}|3": {
-            "profile" : "[BUFFER_PROFILE|egress_lossless_profile0]"
         },
-        "{{ port_names }}|4": {
-            "profile" : "[BUFFER_PROFILE|egress_lossless_profile1]"
+        "BUFFER_QUEUE_TABLE:{{ port_names }}:3-4": {
+            "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
         },
-        "{{ port_names }}|0-1": {
+        "BUFFER_QUEUE_TABLE:{{ port_names }}:0-1": {
             "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
         }
     }
diff --git a/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/pg_profile_lookup.ini b/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/pg_profile_lookup.ini
deleted file mode 100644
index f3a0840558a6..000000000000
--- a/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/pg_profile_lookup.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# PG lossless profiles.
-# speed cable size    xon  xoff threshold
-  10000  5m   113664 18432 76800 0
-  25000  5m   113664 18432 76800 0
-  40000  5m   113664 18432 76800 0
-  50000  5m   113664 18432 76800 0
- 100000  5m   113664 18432 76800 0
-  10000  40m  113664 18432 76800 0
-  25000  40m  113664 18432 76800 0
-  40000  40m  113664 18432 76800 0
-  50000  40m  113664 18432 76800 0
- 100000  40m  113664 18432 76800 0
-  10000  300m 113664 18432 76800 0
-  25000  300m 113664 18432 76800 0
-  40000  300m 113664 18432 76800 0
-  50000  300m 113664 18432 76800 0
- 100000  300m 113664 18432 76800 0