diff --git a/classes/obmc-phosphor-discovery-service.bbclass b/classes/obmc-phosphor-discovery-service.bbclass
index 9b66e7e..73a4875 100644
--- a/classes/obmc-phosphor-discovery-service.bbclass
+++ b/classes/obmc-phosphor-discovery-service.bbclass
@@ -55,8 +55,8 @@
     if not avahi_enabled and slp_enabled:
         return
 
-    avahi_service_dir = d.getVar('AVAHI_SERVICES_DIR', True)
-    slp_service_dir = d.getVar('SLP_SERVICES_DIR', True)
+    avahi_service_dir = d.getVar('AVAHI_SERVICES_DIR', True).strip()
+    slp_service_dir = d.getVar('SLP_SERVICES_DIR', True).strip()
 
     if not os.path.exists(avahi_service_dir):
         os.makedirs(avahi_service_dir)