diff --git a/puppet/role.role.j2.yaml b/puppet/role.role.j2.yaml
index 8f7c09c696..b431880ea8 100644
--- a/puppet/role.role.j2.yaml
+++ b/puppet/role.role.j2.yaml
@@ -313,9 +313,11 @@ resources:
       user_data_format: SOFTWARE_CONFIG
       user_data: {get_resource: UserData}
       name:
-        str_replace:
-            template: {get_param: Hostname}
-            params: {get_param: HostnameMap}
+        yaql:
+          expression: $.data.hostname_map.get($.data.hostname, $.data.hostname).toLower()
+          data:
+            hostname: {get_param: Hostname}
+            hostname_map: {get_param: HostnameMap}
       software_config_transport: {get_param: SoftwareConfigTransport}
       metadata:
         map_merge: