diff --git a/Makefile b/Makefile
index 908a228..6933ff9 100644
--- a/Makefile
+++ b/Makefile
@@ -45,5 +45,7 @@ install:
 	# receiver part
 	mkdir -p $(DESTDIR)/usr/bin/qubes $(DESTDIR)/usr/lib/systemd/system $(DESTDIR)/etc/qubes/post-install.d
 	install -m 755 receiver/20-dummy-psu.sh $(DESTDIR)/etc/qubes/post-install.d
-	install -m 775 receiver/qubes-psu-client $(DESTDIR)/usr/bin
-	install -m 664 receiver/qubes-psu-client@.service receiver/module-load-dummy-psu.service $(DESTDIR)/usr/lib/systemd/system
+	install -m 755 receiver/qubes-psu-client $(DESTDIR)/usr/bin
+	install -m 644 receiver/qubes-psu-client@.service receiver/module-load-dummy-psu.service $(DESTDIR)/usr/lib/systemd/system
+	install -D -m 644 receiver/qubes-psu-client@default.service-default.conf \
+		$(DESTDIR)/usr/lib/systemd/system/qubes-psu-client@default.service.d/30-default.conf
diff --git a/dummy-psu.spec.in b/dummy-psu.spec.in
index 42ce613..cf4268b 100644
--- a/dummy-psu.spec.in
+++ b/dummy-psu.spec.in
@@ -74,6 +74,7 @@ make client
 /etc/qubes/post-install.d/20-dummy-psu.sh
 /usr/bin/qubes-psu-client
 /usr/lib/systemd/system/qubes-psu-client@.service
+/usr/lib/systemd/system/qubes-psu-client@default.service.d/30-default.conf
 /usr/lib/systemd/system/module-load-dummy-psu.service
 
 
diff --git a/receiver/module-load-dummy-psu.service b/receiver/module-load-dummy-psu.service
index ce09e95..8ee658c 100644
--- a/receiver/module-load-dummy-psu.service
+++ b/receiver/module-load-dummy-psu.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Dummy psu module loader service
-ConditionPathExistsGlob=/var/run/qubes-service/dummy-psu@*
+ConditionPathExistsGlob=/var/run/qubes-service/dummy-psu*
 
 [Service]
 Type=oneshot
@@ -9,4 +9,4 @@ ExecStart=/sbin/modprobe dummy-psu
 ExecStop=/sbin/rmmod dummy-psu
 
 [Install]
-WantedBy=multi-user.target
\ No newline at end of file
+WantedBy=multi-user.target
diff --git a/receiver/qubes-psu-client@.service b/receiver/qubes-psu-client@.service
index b0a8d6f..bfcb422 100644
--- a/receiver/qubes-psu-client@.service
+++ b/receiver/qubes-psu-client@.service
@@ -1,10 +1,10 @@
 [Unit]
 Description=Dummy power supply client service
-ConditionPathExists=/var/run/qubes-service/dummy-psu@%i
+ConditionPathExists=/var/run/qubes-service/dummy-psu-%i
 After=qubes-qrexec-agent.service module-load-dummy-psu.service
 
 [Service]
 ExecStart=/usr/bin/qubes-psu-client %i
 
 [Install]
-WantedBy=multi-user.target
\ No newline at end of file
+WantedBy=multi-user.target
diff --git a/receiver/qubes-psu-client@default.service-default.conf b/receiver/qubes-psu-client@default.service-default.conf
new file mode 100644
index 0000000..f499f97
--- /dev/null
+++ b/receiver/qubes-psu-client@default.service-default.conf
@@ -0,0 +1,5 @@
+[Unit]
+# replace /var/run/qubes-service/dummy-psu-default with just
+# /var/run/qubes-service/dummy-psu
+ConditionPathExists=
+ConditionPathExists=/var/run/qubes-service/dummy-psu