diff --git a/classes/obmc-phosphor-discovery-service.bbclass b/classes/obmc-phosphor-discovery-service.bbclass
index e912bea..fdade60 100644
--- a/classes/obmc-phosphor-discovery-service.bbclass
+++ b/classes/obmc-phosphor-discovery-service.bbclass
@@ -72,7 +72,8 @@
             fd.write('<?xml version="1.0" ?>\n')
             fd.write('<!DOCTYPE service-group SYSTEM "avahi-service.dtd">\n')
             fd.write('<service-group>\n')
-            fd.write('        <name>%s</name>\n' % service_name)
+            fd.write('        <name replace-wildcards="yes">%s on %%h</name>\n'
+			    % service_name)
             fd.write('        <service>\n')
             fd.write('                <type>%s</type>\n' % service_type)
             fd.write('                <port>%s</port>\n' % service_port)