diff --git a/puppet/role.role.j2.yaml b/puppet/role.role.j2.yaml
index 47573bb6a5..249a25e893 100644
--- a/puppet/role.role.j2.yaml
+++ b/puppet/role.role.j2.yaml
@@ -411,7 +411,7 @@ resources:
       user_data: {get_resource: UserData}
       name:
         yaql:
-          expression: $.data.hostname_map.get($.data.hostname, $.data.hostname)
+          expression: $.data.hostname_map.get($.data.hostname, $.data.hostname).toLower()
           data:
             hostname: {get_param: Hostname}
             hostname_map: {get_param: HostnameMap}