diff --git a/systemd/electricity-server.service b/systemd/electricity-server.service
index 488dd0f..644bdfe 100644
--- a/systemd/electricity-server.service
+++ b/systemd/electricity-server.service
@@ -5,9 +5,10 @@ After=network.target
 
 [Service]
 Type=simple
-Environment=ASPNETCORE_URLS=http://*:5000
+Environment=ASPNETCORE_URLS=http://*:3002
+WorkingDirectory=/home/pi
 ExecStart=/home/pi/.dotnet/dotnet /home/pi/bin/Electricity.Api/Electricity.Api.dll --connection-string /home/pi/logs/electricity.logs
-Restart=always
+Restart=on-abnormal
 RestartSec=30
 User=pi
 
diff --git a/systemd/solar-server.service b/systemd/solar-server.service
index cdb8840..be8980d 100644
--- a/systemd/solar-server.service
+++ b/systemd/solar-server.service
@@ -6,8 +6,9 @@ After=network.target
 [Service]
 Type=simple
 Environment=ASPNETCORE_URLS=http://*:3001
+WorkingDirectory=/home/pi
 ExecStart=/home/pi/.dotnet/dotnet /home/pi/bin/Solar.Api/Solar.Api.dll
-Restart=always
+Restart=on-abnormal
 RestartSec=30
 User=pi