diff --git a/jenkins_jobs/modules/wrappers.py b/jenkins_jobs/modules/wrappers.py
index 17f45e7c9..7411a909a 100644
--- a/jenkins_jobs/modules/wrappers.py
+++ b/jenkins_jobs/modules/wrappers.py
@@ -1810,17 +1810,16 @@ def custom_tools(registry, xml_parent, data):
     tool_node = base + '.CustomToolInstallWrapper_-SelectedTool'
     for tool in tools:
         tool_wrapper = XML.SubElement(wrapper_tools, tool_node)
-        XML.SubElement(tool_wrapper, 'name').text = str(tool)
+        mapping = [('', 'name', tool)]
+        convert_mapping_to_xml(tool_wrapper, data, mapping, fail_required=True)
 
     opts = XML.SubElement(wrapper,
                           'multiconfigOptions')
-    skip_install = str(data.get('skip-master-install', 'false'))
-    XML.SubElement(opts,
-                   'skipMasterInstallation').text = skip_install
+    mapping = [('skip-master-install', 'skipMasterInstallation', False)]
+    convert_mapping_to_xml(opts, data, mapping, fail_required=True)
 
-    convert_home = str(data.get('convert-homes-to-upper', 'false'))
-    XML.SubElement(wrapper,
-                   'convertHomesToUppercase').text = convert_home
+    mapping = [('convert-homes-to-upper', 'convertHomesToUppercase', False)]
+    convert_mapping_to_xml(wrapper, data, mapping, fail_required=True)
 
 
 def nodejs_installator(registry, xml_parent, data):
diff --git a/tests/wrappers/fixtures/custom-tools001.xml b/tests/wrappers/fixtures/custom-tools001.xml
index 97fd01c3b..6e7c6438c 100644
--- a/tests/wrappers/fixtures/custom-tools001.xml
+++ b/tests/wrappers/fixtures/custom-tools001.xml
@@ -8,9 +8,9 @@
         </com.cloudbees.jenkins.plugins.customtools.CustomToolInstallWrapper_-SelectedTool>
       </selectedTools>
       <multiconfigOptions>
-        <skipMasterInstallation>True</skipMasterInstallation>
+        <skipMasterInstallation>true</skipMasterInstallation>
       </multiconfigOptions>
-      <convertHomesToUppercase>True</convertHomesToUppercase>
+      <convertHomesToUppercase>true</convertHomesToUppercase>
     </com.cloudbees.jenkins.plugins.customtools.CustomToolInstallWrapper>
   </buildWrappers>
-</project>
\ No newline at end of file
+</project>