diff --git a/files/build_templates/qos_config.j2 b/files/build_templates/qos_config.j2
index 700a63693..a5e682d96 100644
--- a/files/build_templates/qos_config.j2
+++ b/files/build_templates/qos_config.j2
@@ -455,13 +455,11 @@
 {% endif %}
 {% endif %}
 {% if port not in PORT_DPC %}
-            "tc_to_pg_map"    : "AZURE",
+            "tc_to_pg_map"    : "AZURE"{% if port not in PORT_SERVICE %},{% endif %}
 {% else %}
-            "tc_to_pg_map"    : "AZURE_DPC",
+            "tc_to_pg_map"    : "AZURE_DPC"{% if port not in PORT_SERVICE %},{% endif %}
 {% endif %}
-{% if port in PORT_SERVICE %}
-            "pfc_to_queue_map": ""
-{% else %}
+{% if port not in PORT_SERVICE %}
             "pfc_to_queue_map": "AZURE"
 {% endif %}
         }{% if not loop.last %},{% endif %}
diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7060x6.json b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7060x6.json
index da2c59073..87ced8b13 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7060x6.json
+++ b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7060x6.json
@@ -1156,14 +1156,12 @@
         "Ethernet512": {
             "dscp_to_tc_map"  : "AZURE",
             "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": ""
+            "tc_to_pg_map"    : "AZURE"
         },
         "Ethernet513": {
             "dscp_to_tc_map"  : "AZURE",
             "tc_to_queue_map" : "AZURE",
-            "tc_to_pg_map"    : "AZURE",
-            "pfc_to_queue_map": ""
+            "tc_to_pg_map"    : "AZURE"
         }
     },
 "WRED_PROFILE": {