diff --git a/Makefile b/Makefile
index 4954759..70b4edc 100644
--- a/Makefile
+++ b/Makefile
@@ -16,9 +16,7 @@ $(CSS): $(APP)/css/*
 	$(LESS) $(APP)/css/app.less > $@
 
 service: $(SERVICE)
-	mkdir -p $(SYSD_USER)
-	ln -fs $(realpath $^) $(SYSD_USER)/$^
-	systemctl --user daemon-reload
+	systemctl --user enable $(PWD)/$(SERVICE)
 
 $(SERVICE): misc/cyp.service.template
 	cat $^ | envsubst > $@
@@ -27,6 +25,7 @@ watch: all
 	while inotifywait -e MODIFY -r $(APP)/css $(APP)/js ; do make $^ ; done
 
 clean:
+	systemctl --user disable $(SERVICE)
 	rm -f $(SERVICE) $(CSS)
 
 .PHONY: all watch icons service clean
diff --git a/misc/cyp.service.template b/misc/cyp.service.template
index ef3ab6c..09de70e 100644
--- a/misc/cyp.service.template
+++ b/misc/cyp.service.template
@@ -6,4 +6,4 @@ WorkingDirectory=$PWD
 ExecStart=node .
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=default.target