diff --git a/Makefile b/Makefile
index 7654b0ffd6..1eabc7f083 100644
--- a/Makefile
+++ b/Makefile
@@ -224,10 +224,11 @@ stratisd-min:
 	cargo build --bin=stratisd-min ${SYSTEMD_FEATURES} ${TARGET_ARGS}
 
 install-cfg:
+	mkdir -p $(DESTDIR)$(UNITDIR)
 	install -Dpm0644 -t $(DESTDIR)$(DATADIR)/dbus-1/system.d stratisd.conf
 	install -Dpm0644 -t $(DESTDIR)$(MANDIR)/man8 docs/stratisd.8
 	install -Dpm0644 -t $(DESTDIR)$(UDEVDIR)/rules.d udev/61-stratisd.rules
-	install -Dpm0644 -t $(DESTDIR)$(UNITDIR) systemd/stratisd.service
+	sed 's|@LIBEXECDIR@|$(LIBEXECDIR)|' systemd/stratisd.service.in > $(DESTDIR)$(UNITDIR)/stratisd.service
 	install -Dpm0755 -d $(DESTDIR)$(DRACUTDIR)/modules.d/90stratis
 	install -Dpm0755 -t $(DESTDIR)$(DRACUTDIR)/modules.d/90stratis dracut/90stratis/module-setup.sh
 	install -Dpm0755 -t $(DESTDIR)$(DRACUTDIR)/modules.d/90stratis dracut/90stratis/stratis-rootfs-setup
@@ -236,8 +237,8 @@ install-cfg:
 	install -Dpm0755 -d $(DESTDIR)$(DRACUTDIR)/modules.d/90stratis-clevis
 	install -Dpm0755 -t $(DESTDIR)$(DRACUTDIR)/modules.d/90stratis-clevis dracut/90stratis-clevis/module-setup.sh
 	install -Dpm0755 -t $(DESTDIR)$(DRACUTDIR)/modules.d/90stratis-clevis dracut/90stratis-clevis/stratis-clevis-rootfs-setup
-	install -Dpm0644 -t $(DESTDIR)$(UNITDIR) systemd/stratisd-min-postinitrd.service
-	install -Dpm0644 -t $(DESTDIR)$(UNITDIR) systemd/stratis-fstab-setup@.service
+	sed 's|@LIBEXECDIR@|$(LIBEXECDIR)|' systemd/stratisd-min-postinitrd.service.in > $(DESTDIR)$(UNITDIR)/stratisd-min-postinitrd.service
+	sed 's|@UNITEXECDIR@|$(UNITEXECDIR)|' systemd/stratis-fstab-setup@.service.in > $(DESTDIR)$(UNITDIR)/stratis-fstab-setup@.service
 
 install: install-cfg
 	mkdir -p $(DESTDIR)$(UNITGENDIR)
diff --git a/systemd/stratis-fstab-setup@.service b/systemd/stratis-fstab-setup@.service.in
similarity index 78%
rename from systemd/stratis-fstab-setup@.service
rename to systemd/stratis-fstab-setup@.service.in
index e7efc1b1bf..d7d9a4880f 100644
--- a/systemd/stratis-fstab-setup@.service
+++ b/systemd/stratis-fstab-setup@.service.in
@@ -5,5 +5,5 @@ DefaultDependencies=no
 Requires=stratisd-min-postinitrd.service
 
 [Service]
-ExecStart=/usr/lib/systemd/stratis-fstab-setup %i
+ExecStart=@UNITEXECDIR@/stratis-fstab-setup %i
 Type=oneshot
diff --git a/systemd/stratisd-min-postinitrd.service b/systemd/stratisd-min-postinitrd.service.in
similarity index 85%
rename from systemd/stratisd-min-postinitrd.service
rename to systemd/stratisd-min-postinitrd.service.in
index fb0027a960..987f44ad82 100644
--- a/systemd/stratisd-min-postinitrd.service
+++ b/systemd/stratisd-min-postinitrd.service.in
@@ -10,7 +10,7 @@ Requires=systemd-udevd.service
 Type=notify
 Environment="RUST_BACKTRACE=1"
 ExecStartPre=-mkdir -p /run/cryptsetup
-ExecStart=/usr/libexec/stratisd-min --log-level debug
+ExecStart=@LIBEXECDIR@/stratisd-min --log-level debug
 KillSignal=SIGINT
 KillMode=process
 Restart=on-abort
diff --git a/systemd/stratisd.service b/systemd/stratisd.service.in
similarity index 83%
rename from systemd/stratisd.service
rename to systemd/stratisd.service.in
index e4a742430c..b183adff91 100644
--- a/systemd/stratisd.service
+++ b/systemd/stratisd.service.in
@@ -7,7 +7,7 @@ DefaultDependencies=no
 BusName=org.storage.stratis3
 Type=dbus
 Environment="RUST_BACKTRACE=1"
-ExecStart=/usr/libexec/stratisd --log-level debug
+ExecStart=@LIBEXECDIR@/stratisd --log-level debug
 KillSignal=SIGINT
 KillMode=process
 Restart=on-abort