diff --git a/Makefile b/Makefile
index 741bd5b..62a6e2f 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ build: Makefile
 deploy:
 	docker service rm dummy || true
 	install -D -m 644 config/systemd/dummy.service /etc/systemd/system
-	podman stop dummy || true && podman rm dummy || true
+	systemctl stop dummy.service || true
 	podman run --name dummy -d dummy:latest
 	systemctl daemon-reload
 	systemctl enable dummy.service
diff --git a/config/systemd/dummy.service b/config/systemd/dummy.service
index 2ef3b3b..7f69865 100644
--- a/config/systemd/dummy.service
+++ b/config/systemd/dummy.service
@@ -5,6 +5,7 @@ Description=A dummy service
 Restart=always
 ExecStart=/usr/bin/podman start -a dummy
 ExecStop=/usr/bin/podman stop -t 2 dummy
+ExecStopPost=/usr/bin/podman rm -f dummy
 
 [Install]
 WantedBy=default.target