diff --git a/.github/workflows/auto_deploy.yml b/.github/workflows/auto_deploy.yml
index 4af6884..88f3081 100644
--- a/.github/workflows/auto_deploy.yml
+++ b/.github/workflows/auto_deploy.yml
@@ -26,4 +26,4 @@ jobs:
           REMOTE_USER: ${{ secrets.REMOTE_USER }}
           TARGET: ${{ secrets.REMOTE_TARGET }}
           SCRIPT_AFTER: |
-            sudo systemctl restart openrails-telemetry.service
+            sudo systemctl restart telemetry.openrails.org.service
diff --git a/Open Rails Telemetry.csproj b/Open Rails Telemetry.csproj
index b5a33d1..990b9ee 100644
--- a/Open Rails Telemetry.csproj	
+++ b/Open Rails Telemetry.csproj	
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Content Include="openrails-telemetry.service">
+    <Content Include="telemetry.openrails.org.service">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
diff --git a/Pages/Shared/_Layout.cshtml b/Pages/Shared/_Layout.cshtml
index 375d1e6..c7aa4b0 100644
--- a/Pages/Shared/_Layout.cshtml
+++ b/Pages/Shared/_Layout.cshtml
@@ -22,7 +22,7 @@
         @RenderBody()
     </main>
     <footer>
-        Open Rails Telemetry - <a href="https://www.elvastower.com/forums/index.php?/topic/37702-opt-in-anonymous-telemetry/">About</a> - <a href="https://github.com/openrails/telemetry">Source Code</a>
+        Open Rails Telemetry - <a href="https://www.elvastower.com/forums/index.php?/topic/37702-opt-in-anonymous-telemetry/">About</a> - <a href="https://github.com/openrails/telemetry.openrails.org">Source Code</a>
     </footer>
     <script src="~/js/site.js" asp-append-version="true"></script>
     @await RenderSectionAsync("Scripts", required: false)
diff --git a/openrails-telemetry.service b/telemetry.openrails.org.service
similarity index 60%
rename from openrails-telemetry.service
rename to telemetry.openrails.org.service
index 48b1b75..792a26a 100644
--- a/openrails-telemetry.service
+++ b/telemetry.openrails.org.service
@@ -2,11 +2,11 @@
 Description=Open Rails Telemetry service
 
 [Service]
-WorkingDirectory=/var/aspnetcore/openrails-telemetry
-ExecStart=/usr/bin/dotnet "/var/aspnetcore/openrails-telemetry/Open Rails Telemetry.dll"
+WorkingDirectory=/var/dotnet/telemetry.openrails.org
+ExecStart=/usr/bin/dotnet "/var/dotnet/telemetry.openrails.org/Open Rails Telemetry.dll"
 Restart=always
 RestartSec=10
-SyslogIdentifier=aspnet-openrails-telemetry
+SyslogIdentifier=dotnet-telemetry.openrails.org
 User=openrails
 Environment=ASPNETCORE_ENVIRONMENT=Production ASPNETCORE_URLS=http://127.0.0.1:5001