diff --git a/meta-phosphor/classes/obmc-phosphor-systemd.bbclass b/meta-phosphor/classes/obmc-phosphor-systemd.bbclass
index 10553c5..c6a2e69 100644
--- a/meta-phosphor/classes/obmc-phosphor-systemd.bbclass
+++ b/meta-phosphor/classes/obmc-phosphor-systemd.bbclass
@@ -80,7 +80,7 @@
                 base = self.unit.replace('dbus-', '')
                 base = base.replace('.%s' % cls, '')
                 if self.is_instance:
-                    base = base.rstrip('@%s' % self.instance)
+                    base = base.replace('@%s' % self.instance, '')
                 if self.is_template:
                     base = base.rstrip('@')
                 return base