diff --git a/buildroot-external/package/firstboot-service/firstboot-service.mk b/buildroot-external/package/firstboot-service/firstboot-service.mk
index f6f3b635..61e87866 100644
--- a/buildroot-external/package/firstboot-service/firstboot-service.mk
+++ b/buildroot-external/package/firstboot-service/firstboot-service.mk
@@ -15,9 +15,6 @@ define FIRSTBOOT_SERVICE_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 0755 $(@D)/firstboot $(TARGET_DIR)/usr/sbin/
 	$(INSTALL) -D -m 644 $(@D)/firstboot.service \
 		$(TARGET_DIR)/usr/lib/systemd/system/firstboot.service
-	mkdir -p $(TARGET_DIR)/etc/systemd/system/sysinit.target.wants
-	ln -fs ../../../../usr/lib/systemd/system/firstboot.service \
-		$(TARGET_DIR)/etc/systemd/system/sysinit.target.wants/firstboot.service
 	touch $(TARGET_DIR)/etc/firstboot
 endef
 
diff --git a/buildroot-external/package/hostname-service/hostname-service.mk b/buildroot-external/package/hostname-service/hostname-service.mk
index 1e2a6db6..430fd0a3 100644
--- a/buildroot-external/package/hostname-service/hostname-service.mk
+++ b/buildroot-external/package/hostname-service/hostname-service.mk
@@ -13,9 +13,6 @@ HOSTNAME_SERVICE_LICENSE_FILES = LICENSE
 define HOSTNAME_SERVICE_INSTALL_TARGET_CMDS
 	$(INSTALL) -D -m 644 $(@D)/hostname.service \
 		$(TARGET_DIR)/usr/lib/systemd/system/hostname.service
-	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
-	ln -fs ../../../../usr/lib/systemd/system/hostname.service \
-		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/hostname.service
 endef
 
 $(eval $(generic-package))
diff --git a/buildroot-external/package/mycroft-service/mycroft-service.mk b/buildroot-external/package/mycroft-service/mycroft-service.mk
index 3f4e8737..309cb3e5 100644
--- a/buildroot-external/package/mycroft-service/mycroft-service.mk
+++ b/buildroot-external/package/mycroft-service/mycroft-service.mk
@@ -23,19 +23,6 @@ define MYCROFT_SERVICE_INSTALL_TARGET_CMDS
                 $(TARGET_DIR)/usr/lib/systemd/system/mycroft-enclosure.service
 	$(INSTALL) -D -m 644 $(@D)/mycroft-skills.service \
                 $(TARGET_DIR)/usr/lib/systemd/system/mycroft-skills.service
-	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
-	ln -fs ../../../../usr/lib/systemd/system/mycroft.service \
-		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/mycroft.service
-	ln -fs ../../../../usr/lib/systemd/system/mycroft-messagebus.service \
-                $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/mycroft-messagebus.service
-	ln -fs ../../../../usr/lib/systemd/system/mycroft-audio.service \
-                $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/mycroft-audio.service
-	ln -fs ../../../../usr/lib/systemd/system/mycroft-voice.service \
-                $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/mycroft-voice.service
-	ln -fs ../../../../usr/lib/systemd/system/mycroft-enclosure.service \
-                $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/mycroft-enclosure.service
-	ln -fs ../../../../usr/lib/systemd/system/mycroft-skills.service \
-                $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/mycroft-skills.service
 endef
 
 $(eval $(generic-package))
diff --git a/buildroot-external/package/mycroft-splash/mycroft-splash.mk b/buildroot-external/package/mycroft-splash/mycroft-splash.mk
index e85e6b4f..8c4218f8 100644
--- a/buildroot-external/package/mycroft-splash/mycroft-splash.mk
+++ b/buildroot-external/package/mycroft-splash/mycroft-splash.mk
@@ -13,15 +13,9 @@ MYCROFT_SPLASH_AUTORECONF = YES
 define MYCROFT_SPLASH_INSTALL_INIT_SYSTEMD
 	$(INSTALL) -D -m 644 $(BR2_EXTERNAL_MYCROFTOS_PATH)/package/mycroft-splash/mycroft-splash-start.service \
 		$(TARGET_DIR)/usr/lib/systemd/system/mycroft-splash-start.service
-	$(INSTALL) -d $(TARGET_DIR)/etc/systemd/system/sysinit.target.wants
-	ln -sf  ../../../../usr/lib/systemd/system/mycroft-splash-start.service \
-		$(TARGET_DIR)/etc/systemd/system/sysinit.target.wants/
 
 	$(INSTALL) -D -m 644 $(BR2_EXTERNAL_MYCROFTOS_PATH)/package/mycroft-splash/mycroft-splash-quit.service \
 		$(TARGET_DIR)/usr/lib/systemd/system/mycroft-splash-quit.service
-	$(INSTALL) -d $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
-	ln -sf  ../../../../usr/lib/systemd/system/mycroft-splash-quit.service \
-		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/
 endef
 
 define MYCROFT_SPLASH_CHANGE_IMAGE
diff --git a/buildroot-external/package/prepare_system-service/prepare_system-service.mk b/buildroot-external/package/prepare_system-service/prepare_system-service.mk
index 71b979cf..95ec3282 100644
--- a/buildroot-external/package/prepare_system-service/prepare_system-service.mk
+++ b/buildroot-external/package/prepare_system-service/prepare_system-service.mk
@@ -14,9 +14,6 @@ define PREPARE_SYSTEM_SERVICE_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 0755 $(@D)/prepare_system $(TARGET_DIR)/usr/sbin/
 	$(INSTALL) -D -m 644 $(@D)/prepare_system.service \
 		$(TARGET_DIR)/usr/lib/systemd/system/prepare_system.service
-	mkdir -p $(TARGET_DIR)/etc/systemd/system/sysinit.target.wants
-	ln -fs ../../../../usr/lib/systemd/system/prepare_system.service \
-		$(TARGET_DIR)/etc/systemd/system/sysinit.target.wants/prepare_system.service
 endef
 
 $(eval $(generic-package))
diff --git a/buildroot-external/package/respeaker/respeaker.mk b/buildroot-external/package/respeaker/respeaker.mk
index 9b9b8fa5..fa7b4a43 100644
--- a/buildroot-external/package/respeaker/respeaker.mk
+++ b/buildroot-external/package/respeaker/respeaker.mk
@@ -14,9 +14,6 @@ $(eval $(kernel-module))
 define RESPEAKER_INSTALL_TARGET_CMDS
 	$(INSTALL) -D -m 0644 $(BR2_EXTERNAL_MYCROFTOS_PATH)/package/respeaker/seeed-voicecard.service \
 		$(TARGET_DIR)/usr/lib/systemd/system/seeed-voicecard.service
-	mkdir -p $(TARGET_DIR)/etc/systemd/system/sysinit.target.wants
-	ln -fs ../../../../usr/lib/systemd/system/seeed-voicecard.service \
-		$(TARGET_DIR)/etc/systemd/system/sysinit.target.wants/seeed-voicecard.service
 
 	$(INSTALL) -D -m 0644 $(BR2_EXTERNAL_MYCROFTOS_PATH)/package/respeaker/respeaker.conf \
 		$(TARGET_DIR)/etc/modules-load.d/respeaker.conf