diff --git a/files/build_templates/buffers_config.j2 b/files/build_templates/buffers_config.j2
index 88899e37680b..2db9372340c4 100644
--- a/files/build_templates/buffers_config.j2
+++ b/files/build_templates/buffers_config.j2
@@ -131,10 +131,7 @@ def
 {{ defs.generate_pg_profils(port_names_active) }}
 {% else %}
     "BUFFER_PG": {
-        "{{ port_names_active }}|0-2": {
-            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
-        },
-        "{{ port_names_active }}|5-6": {
+        "{{ port_names_active }}|0": {
             "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
         }
     },
diff --git a/files/build_templates/qos_config.j2 b/files/build_templates/qos_config.j2
index 18d12d473941..a666367873bd 100644
--- a/files/build_templates/qos_config.j2
+++ b/files/build_templates/qos_config.j2
@@ -38,12 +38,12 @@
     "TC_TO_PRIORITY_GROUP_MAP": {
         "AZURE": {
             "0": "0",
-            "1": "1",
-            "2": "2",
+            "1": "0",
+            "2": "0",
             "3": "3",
             "4": "4",
-            "5": "5",
-            "6": "6",
+            "5": "0",
+            "6": "0",
             "7": "7"
         }
     },
diff --git a/src/sonic-config-engine/tests/sample_output/buffers-dell6100.json b/src/sonic-config-engine/tests/sample_output/buffers-dell6100.json
index 269c155d68f3..0b6c8cbe19a3 100644
--- a/src/sonic-config-engine/tests/sample_output/buffers-dell6100.json
+++ b/src/sonic-config-engine/tests/sample_output/buffers-dell6100.json
@@ -105,10 +105,7 @@
         }
     },
     "BUFFER_PG": {
-        "Ethernet0,Ethernet1,Ethernet4,Ethernet5,Ethernet6,Ethernet7,Ethernet8,Ethernet9,Ethernet10,Ethernet11,Ethernet12,Ethernet13,Ethernet14,Ethernet15,Ethernet16,Ethernet17,Ethernet20,Ethernet21,Ethernet22,Ethernet23,Ethernet24,Ethernet25,Ethernet26,Ethernet27,Ethernet28,Ethernet29,Ethernet30,Ethernet31,Ethernet32,Ethernet36,Ethernet37,Ethernet38,Ethernet39,Ethernet40,Ethernet41,Ethernet42,Ethernet48,Ethernet52,Ethernet53,Ethernet54,Ethernet55,Ethernet56,Ethernet57,Ethernet58|0-2": {
-            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
-        },
-        "Ethernet0,Ethernet1,Ethernet4,Ethernet5,Ethernet6,Ethernet7,Ethernet8,Ethernet9,Ethernet10,Ethernet11,Ethernet12,Ethernet13,Ethernet14,Ethernet15,Ethernet16,Ethernet17,Ethernet20,Ethernet21,Ethernet22,Ethernet23,Ethernet24,Ethernet25,Ethernet26,Ethernet27,Ethernet28,Ethernet29,Ethernet30,Ethernet31,Ethernet32,Ethernet36,Ethernet37,Ethernet38,Ethernet39,Ethernet40,Ethernet41,Ethernet42,Ethernet48,Ethernet52,Ethernet53,Ethernet54,Ethernet55,Ethernet56,Ethernet57,Ethernet58|5-6": {
+        "Ethernet0,Ethernet1,Ethernet4,Ethernet5,Ethernet6,Ethernet7,Ethernet8,Ethernet9,Ethernet10,Ethernet11,Ethernet12,Ethernet13,Ethernet14,Ethernet15,Ethernet16,Ethernet17,Ethernet20,Ethernet21,Ethernet22,Ethernet23,Ethernet24,Ethernet25,Ethernet26,Ethernet27,Ethernet28,Ethernet29,Ethernet30,Ethernet31,Ethernet32,Ethernet36,Ethernet37,Ethernet38,Ethernet39,Ethernet40,Ethernet41,Ethernet42,Ethernet48,Ethernet52,Ethernet53,Ethernet54,Ethernet55,Ethernet56,Ethernet57,Ethernet58|0": {
             "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
         }
     },
diff --git a/src/sonic-config-engine/tests/sample_output/qos-dell6100.json b/src/sonic-config-engine/tests/sample_output/qos-dell6100.json
index d1eced032f0d..0387e10dc2f2 100644
--- a/src/sonic-config-engine/tests/sample_output/qos-dell6100.json
+++ b/src/sonic-config-engine/tests/sample_output/qos-dell6100.json
@@ -2,12 +2,12 @@
     "TC_TO_PRIORITY_GROUP_MAP": {
         "AZURE": {
             "0": "0",
-            "1": "1",
-            "2": "2",
+            "1": "0",
+            "2": "0",
             "3": "3",
             "4": "4",
-            "5": "5",
-            "6": "6",
+            "5": "0",
+            "6": "0",
             "7": "7"
         }
     },