diff --git a/templates/teamcity-server.service.j2 b/templates/teamcity-server.service.j2
index 2dd674f..e98114e 100644
--- a/templates/teamcity-server.service.j2
+++ b/templates/teamcity-server.service.j2
@@ -5,13 +5,11 @@ Requires=network.target
 After=syslog.target network.target
 
 [Service]
-Type=oneshot
+Type=forking
 User={{ teamcity_server_user }}
 Group={{ teamcity_server_user }}
-RemainAfterExit=true
-SuccessExitStatus=0 143
 EnvironmentFile=/etc/default/teamcity-server
-PIDFile={{ teamcity_server_dir }}/logs/teamcity-server.pid
+PIDFile={{ teamcity_server_dir }}/logs/teamcity.pid
 ExecStart={{ teamcity_server_dir }}/bin/teamcity-server.sh start
 ExecStop={{ teamcity_server_dir }}/bin/teamcity-server.sh stop