diff --git a/Makefile b/Makefile
index ae25266..a79d529 100644
--- a/Makefile
+++ b/Makefile
@@ -36,8 +36,8 @@ install:
 	gzip -c tools/psi2log.1 > $(DESTDIR)$(MANDIR)/psi2log.1.gz
 
 	-install -d $(DESTDIR)$(SYSTEMDUNITDIR)
-	-sed "s|:TARGET_BIN:|$(BINDIR)|g;s|:TARGET_CONF:|$(CONFDIR)|g" nohang/nohang.service.in > nohang.service
-	-sed "s|:TARGET_BIN:|$(BINDIR)|g;s|:TARGET_CONF:|$(CONFDIR)|g" nohang/nohang-desktop.service.in > nohang-desktop.service
+	env BINDIR=$(BINDIR) CONFDIR=$(CONFDIR) envsubst < nohang/nohang.service.in > nohang.service
+	env BINDIR=$(BINDIR) CONFDIR=$(CONFDIR) envsubst < nohang/nohang-desktop.service.in > nohang-desktop.service
 	-install -m0644 nohang.service $(DESTDIR)$(SYSTEMDUNITDIR)/nohang.service
 	-install -m0644 nohang-desktop.service $(DESTDIR)$(SYSTEMDUNITDIR)/nohang-desktop.service
 	-rm -fv nohang.service
diff --git a/nohang/nohang-desktop.service.in b/nohang/nohang-desktop.service.in
index 5094c2e..9882289 100644
--- a/nohang/nohang-desktop.service.in
+++ b/nohang/nohang-desktop.service.in
@@ -5,7 +5,7 @@ Conflicts=nohang.service
 After=system.slice
 
 [Service]
-ExecStart=:TARGET_BIN:/nohang --config :TARGET_CONF:/nohang/nohang-desktop.conf
+ExecStart=${BINDIR}/nohang --config ${CONFDIR}/nohang/nohang-desktop.conf
 SyslogIdentifier=nohang-desktop
 
 KillMode=mixed
diff --git a/nohang/nohang.service.in b/nohang/nohang.service.in
index e3317ba..066cbf2 100644
--- a/nohang/nohang.service.in
+++ b/nohang/nohang.service.in
@@ -5,7 +5,7 @@ Conflicts=nohang-desktop.service
 After=system.slice
 
 [Service]
-ExecStart=:TARGET_BIN:/nohang --config :TARGET_CONF:/nohang/nohang.conf
+ExecStart=${BINDIR}/nohang --config ${CONFDIR}/nohang/nohang.conf
 SyslogIdentifier=nohang
 
 KillMode=mixed