diff --git a/misc/packaging/systemd/emissary-agent.systemd.service b/misc/packaging/systemd/emissary-agent.systemd.service
index 60e0066..b595390 100644
--- a/misc/packaging/systemd/emissary-agent.systemd.service
+++ b/misc/packaging/systemd/emissary-agent.systemd.service
@@ -6,7 +6,7 @@ After=network.target
 Type=simple
 Restart=always
 WorkingDirectory=/usr/share/emissary
-ExecStart=/usr/bin/emissary --config /etc/emissary/config.yml agent run
+ExecStart=/usr/bin/emissary --config /etc/emissary/agent.yml agent run
 
 [Install]
 WantedBy=multi-user.target
\ No newline at end of file
diff --git a/misc/packaging/systemd/emissary-server.systemd.service b/misc/packaging/systemd/emissary-server.systemd.service
index b9f68fc..2ec2431 100644
--- a/misc/packaging/systemd/emissary-server.systemd.service
+++ b/misc/packaging/systemd/emissary-server.systemd.service
@@ -4,9 +4,9 @@ After=network.target
 
 [Service]
 Type=simple
-Restart=always
+Restart=on-failure
 WorkingDirectory=/usr/share/emissary
-ExecStart=/usr/bin/emissary --config /etc/emissary/config.yml server run
+ExecStart=/usr/bin/emissary --config /etc/emissary/server.yml server run
 
 [Install]
 WantedBy=multi-user.target
\ No newline at end of file