diff --git a/partition/roles/dhcp/templates/dhcpd.hosts.j2 b/partition/roles/dhcp/templates/dhcpd.hosts.j2
index b3858e362..a27626f68 100644
--- a/partition/roles/dhcp/templates/dhcpd.hosts.j2
+++ b/partition/roles/dhcp/templates/dhcpd.hosts.j2
@@ -1,4 +1,4 @@
-#jinja2: lstrip_blocks: "True", trim_blocks: "True"
+#jinja2: lstrip_blocks: True, trim_blocks: True
 {% for host in dhcp_static_hosts %}
 host {{ host.name }} {
   hardware ethernet {{ host.mac }};
diff --git a/partition/roles/sonic-config/templates/frr.conf.j2 b/partition/roles/sonic-config/templates/frr.conf.j2
index b98a7f83f..69f2428f6 100644
--- a/partition/roles/sonic-config/templates/frr.conf.j2
+++ b/partition/roles/sonic-config/templates/frr.conf.j2
@@ -1,4 +1,4 @@
-#jinja2: lstrip_blocks: "True", trim_blocks: "True"
+#jinja2: lstrip_blocks: True, trim_blocks: True
 frr defaults datacenter
 hostname {{ inventory_hostname }}
 !
diff --git a/partition/roles/sonic/templates/frr.conf.j2 b/partition/roles/sonic/templates/frr.conf.j2
index f4cf2fa8b..ee1880873 100644
--- a/partition/roles/sonic/templates/frr.conf.j2
+++ b/partition/roles/sonic/templates/frr.conf.j2
@@ -1,4 +1,4 @@
-#jinja2: lstrip_blocks: "True", trim_blocks: "True"
+#jinja2: lstrip_blocks: True, trim_blocks: True
 frr defaults datacenter
 hostname {{ inventory_hostname }}
 !
diff --git a/partition/roles/sonic/templates/metal.yaml.j2 b/partition/roles/sonic/templates/metal.yaml.j2
index 011120173..e28b8a9bb 100644
--- a/partition/roles/sonic/templates/metal.yaml.j2
+++ b/partition/roles/sonic/templates/metal.yaml.j2
@@ -1,4 +1,4 @@
-#jinja2: lstrip_blocks: "False", trim_blocks: "False"
+#jinja2: lstrip_blocks: True, trim_blocks: True
 ---
 {% set vrfs = [] %}
 DEVICE_METADATA: