diff --git a/jenkins_jobs/modules/project_folder.py b/jenkins_jobs/modules/project_folder.py
index 72555acce..a16a1215c 100644
--- a/jenkins_jobs/modules/project_folder.py
+++ b/jenkins_jobs/modules/project_folder.py
@@ -36,6 +36,7 @@ Job template example:
 
 import xml.etree.ElementTree as XML
 import jenkins_jobs.modules.base
+from jenkins_jobs.modules.helpers import convert_mapping_to_xml
 
 
 class Folder(jenkins_jobs.modules.base.Base):
@@ -50,7 +51,11 @@ class Folder(jenkins_jobs.modules.base.Base):
         XML.SubElement(xml_parent, 'views')
         attributes = {"class": "hudson.views.DefaultViewsTabBar"}
         XML.SubElement(xml_parent, 'viewsTabBar', attrib=attributes)
-        XML.SubElement(xml_parent, 'primaryView').text = 'All'
-        XML.SubElement(xml_parent, 'healthMetrics')
+
+        mappings = [
+            ('', 'primaryView', 'All'),
+            ('', 'healthMetrics', ''),
+        ]
+        convert_mapping_to_xml(xml_parent, data, mappings, True)
 
         return xml_parent