diff --git a/defaults/main.yml b/defaults/main.yml
index a000519..06df01f 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -11,6 +11,7 @@ gitea_packages:
 gitea_base_dir: "/opt/gitea"
 gitea_config_dir: "{{ gitea_base_dir }}/custom/conf"
 gitea_data_dir: "{{ gitea_base_dir }}/data"
+gitea_run_dir: "{{ gitea_base_dir }}/run"
 gitea_template_dir: "{{ gitea_base_dir }}/custom/templates"
 
 gitea_selinux_fcontext:
diff --git a/tasks/install.yml b/tasks/install.yml
index c598d46..ce5d47a 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -19,6 +19,7 @@
         - "{{ gitea_config_dir }}"
         - "{{ gitea_data_dir }}"
         - "{{ gitea_log_dir }}"
+        - "{{ gitea_run_dir }}"
         - "{{ gitea_template_dir }}/custom"
 
     - name: Download Gitea binary
diff --git a/templates/etc/systemd/system/gitea.service.j2 b/templates/etc/systemd/system/gitea.service.j2
index 5fdd5f8..f9186c4 100644
--- a/templates/etc/systemd/system/gitea.service.j2
+++ b/templates/etc/systemd/system/gitea.service.j2
@@ -12,7 +12,7 @@ Environment=GITEA_WORK_DIR={{ gitea_base_dir }}
 User={{ gitea_user }}
 Group={{ gitea_group }}
 WorkingDirectory={{ gitea_base_dir }}
-ExecStart={{ gitea_base_dir }}/gitea-latest web -c {{ gitea_config_dir }}/app.ini
+ExecStart={{ gitea_base_dir }}/gitea-latest web -c {{ gitea_config_dir }}/app.ini -P {{ gitea_run_dir }}/gitea.pid
 Restart=on-failure
 PrivateTmp=yes