diff --git a/install/templates/ACME.xml.gz b/install/templates/ACME.xml.gz
index 98c8269e9d..223c476b04 100644
Binary files a/install/templates/ACME.xml.gz and b/install/templates/ACME.xml.gz differ
diff --git a/install/templates/AKCP_Device.xml.gz b/install/templates/AKCP_Device.xml.gz
index 07338b416f..c62632263f 100644
Binary files a/install/templates/AKCP_Device.xml.gz and b/install/templates/AKCP_Device.xml.gz differ
diff --git a/install/templates/APC_InfraStruXure_InRow_CRAC.xml.gz b/install/templates/APC_InfraStruXure_InRow_CRAC.xml.gz
index 3628f66434..ae1af5d0e1 100644
Binary files a/install/templates/APC_InfraStruXure_InRow_CRAC.xml.gz and b/install/templates/APC_InfraStruXure_InRow_CRAC.xml.gz differ
diff --git a/install/templates/APC_InfraStruXure_PDU.xml.gz b/install/templates/APC_InfraStruXure_PDU.xml.gz
index e92d33b4a9..737ac891e4 100644
Binary files a/install/templates/APC_InfraStruXure_PDU.xml.gz and b/install/templates/APC_InfraStruXure_PDU.xml.gz differ
diff --git a/install/templates/Apache_Webserver.xml.gz b/install/templates/Apache_Webserver.xml.gz
index bb64f40951..e033cd1c0e 100644
Binary files a/install/templates/Apache_Webserver.xml.gz and b/install/templates/Apache_Webserver.xml.gz differ
diff --git a/install/templates/ArubaOS_switch.xml.gz b/install/templates/ArubaOS_switch.xml.gz
index 3c7fd2aa18..b23af7e8d5 100644
Binary files a/install/templates/ArubaOS_switch.xml.gz and b/install/templates/ArubaOS_switch.xml.gz differ
diff --git a/install/templates/Aruba_Instant_AP_Cluster.xml.gz b/install/templates/Aruba_Instant_AP_Cluster.xml.gz
index b050ee2302..e9aefc2d4c 100644
Binary files a/install/templates/Aruba_Instant_AP_Cluster.xml.gz and b/install/templates/Aruba_Instant_AP_Cluster.xml.gz differ
diff --git a/install/templates/Aruba_OSCX_switch_6x00.xml.gz b/install/templates/Aruba_OSCX_switch_6x00.xml.gz
index e25694f360..a1ee9af880 100644
Binary files a/install/templates/Aruba_OSCX_switch_6x00.xml.gz and b/install/templates/Aruba_OSCX_switch_6x00.xml.gz differ
diff --git a/install/templates/Aruba_Wireless_Controller.xml.gz b/install/templates/Aruba_Wireless_Controller.xml.gz
index 742e93323a..ef399a0006 100644
Binary files a/install/templates/Aruba_Wireless_Controller.xml.gz and b/install/templates/Aruba_Wireless_Controller.xml.gz differ
diff --git a/install/templates/BayTech_PDU.xml.gz b/install/templates/BayTech_PDU.xml.gz
index 09537f8b9b..deef8ee614 100644
Binary files a/install/templates/BayTech_PDU.xml.gz and b/install/templates/BayTech_PDU.xml.gz differ
diff --git a/install/templates/Cacti_Stats.xml.gz b/install/templates/Cacti_Stats.xml.gz
index 5da099d8d5..731491f286 100644
Binary files a/install/templates/Cacti_Stats.xml.gz and b/install/templates/Cacti_Stats.xml.gz differ
diff --git a/install/templates/Cisco_Router.xml.gz b/install/templates/Cisco_Router.xml.gz
index 450f889f48..953ebb2a3b 100644
Binary files a/install/templates/Cisco_Router.xml.gz and b/install/templates/Cisco_Router.xml.gz differ
diff --git a/install/templates/Citrix_NetScaler_VPX.xml.gz b/install/templates/Citrix_NetScaler_VPX.xml.gz
index abbc3fbc9e..b99bd2c133 100644
Binary files a/install/templates/Citrix_NetScaler_VPX.xml.gz and b/install/templates/Citrix_NetScaler_VPX.xml.gz differ
diff --git a/install/templates/Clearpass_policy_manager.xml.gz b/install/templates/Clearpass_policy_manager.xml.gz
index 3abbb912b7..f42633d0b6 100644
Binary files a/install/templates/Clearpass_policy_manager.xml.gz and b/install/templates/Clearpass_policy_manager.xml.gz differ
diff --git a/install/templates/ESXi_Device.xml.gz b/install/templates/ESXi_Device.xml.gz
index bab50ef082..6a44b05d27 100644
Binary files a/install/templates/ESXi_Device.xml.gz and b/install/templates/ESXi_Device.xml.gz differ
diff --git a/install/templates/Fortigate.xml.gz b/install/templates/Fortigate.xml.gz
index b79c7818e4..4a406a7306 100644
Binary files a/install/templates/Fortigate.xml.gz and b/install/templates/Fortigate.xml.gz differ
diff --git a/install/templates/Generic_SNMP_Device.xml.gz b/install/templates/Generic_SNMP_Device.xml.gz
index b95db60ae5..8a19e33e90 100644
Binary files a/install/templates/Generic_SNMP_Device.xml.gz and b/install/templates/Generic_SNMP_Device.xml.gz differ
diff --git a/install/templates/HPE_NimbleAlletra_storage.xml.gz b/install/templates/HPE_NimbleAlletra_storage.xml.gz
index 65cbdb7453..8bc29d42d7 100644
Binary files a/install/templates/HPE_NimbleAlletra_storage.xml.gz and b/install/templates/HPE_NimbleAlletra_storage.xml.gz differ
diff --git a/install/templates/HPE_iLO.xml.gz b/install/templates/HPE_iLO.xml.gz
index 04700f8854..df0d33984c 100644
Binary files a/install/templates/HPE_iLO.xml.gz and b/install/templates/HPE_iLO.xml.gz differ
diff --git a/install/templates/Local_Linux_Machine.xml.gz b/install/templates/Local_Linux_Machine.xml.gz
index c1bae9cf1e..85d6ccf60c 100644
Binary files a/install/templates/Local_Linux_Machine.xml.gz and b/install/templates/Local_Linux_Machine.xml.gz differ
diff --git a/install/templates/MikroTik_Device.xml.gz b/install/templates/MikroTik_Device.xml.gz
index e83e2ca042..0142111bbf 100644
Binary files a/install/templates/MikroTik_Device.xml.gz and b/install/templates/MikroTik_Device.xml.gz differ
diff --git a/install/templates/MikroTik_Switch_SWOS.xml.gz b/install/templates/MikroTik_Switch_SWOS.xml.gz
index f119f31293..26d411fa34 100644
Binary files a/install/templates/MikroTik_Switch_SWOS.xml.gz and b/install/templates/MikroTik_Switch_SWOS.xml.gz differ
diff --git a/install/templates/Motorola_SB6141.xml.gz b/install/templates/Motorola_SB6141.xml.gz
index 8f4f1afe12..7f6f7914ac 100644
Binary files a/install/templates/Motorola_SB6141.xml.gz and b/install/templates/Motorola_SB6141.xml.gz differ
diff --git a/install/templates/NetSNMP_Device.xml.gz b/install/templates/NetSNMP_Device.xml.gz
index 60423d41fe..8d881b2e83 100644
Binary files a/install/templates/NetSNMP_Device.xml.gz and b/install/templates/NetSNMP_Device.xml.gz differ
diff --git a/install/templates/PING_Advanced_Ping.xml.gz b/install/templates/PING_Advanced_Ping.xml.gz
index 3ff4c307ba..054968fa5b 100644
Binary files a/install/templates/PING_Advanced_Ping.xml.gz and b/install/templates/PING_Advanced_Ping.xml.gz differ
diff --git a/install/templates/SNMP_Printer.xml.gz b/install/templates/SNMP_Printer.xml.gz
index 8a3cd2e5de..8063822607 100644
Binary files a/install/templates/SNMP_Printer.xml.gz and b/install/templates/SNMP_Printer.xml.gz differ
diff --git a/install/templates/SNMP_UPS.xml.gz b/install/templates/SNMP_UPS.xml.gz
index f14e761e19..147b6fab05 100644
Binary files a/install/templates/SNMP_UPS.xml.gz and b/install/templates/SNMP_UPS.xml.gz differ
diff --git a/install/templates/Synology_NAS.xml.gz b/install/templates/Synology_NAS.xml.gz
index 850f0b2bf3..668ae59adf 100644
Binary files a/install/templates/Synology_NAS.xml.gz and b/install/templates/Synology_NAS.xml.gz differ
diff --git a/install/templates/Windows_Device.xml.gz b/install/templates/Windows_Device.xml.gz
index 164628b44c..a8ac6c52bc 100644
Binary files a/install/templates/Windows_Device.xml.gz and b/install/templates/Windows_Device.xml.gz differ