diff --git a/ansible/roles/gitea-runner/tasks/download_gitea_runner.yml b/ansible/roles/gitea-runner/tasks/download_gitea_runner.yml
index 75baf3b..ad5f355 100644
--- a/ansible/roles/gitea-runner/tasks/download_gitea_runner.yml
+++ b/ansible/roles/gitea-runner/tasks/download_gitea_runner.yml
@@ -40,7 +40,7 @@
     url: "{{ gitea_runner_url }}"
     dest: "{{ gitea_runner_binary_path }}"
     mode: "0755"
-    force: true
+    force: false
   register: gitea_runner_download
   notify: Restart gitea-runner
   retries: 3
diff --git a/ansible/roles/gitea-runner/tasks/user_setup.yml b/ansible/roles/gitea-runner/tasks/user_setup.yml
index afac28b..6159853 100644
--- a/ansible/roles/gitea-runner/tasks/user_setup.yml
+++ b/ansible/roles/gitea-runner/tasks/user_setup.yml
@@ -12,9 +12,14 @@
   ansible.builtin.set_fact:
     gitea_runner_uid: "{{ runner_user.uid }}"
 
+- name: Check if lingering is already enabled
+  ansible.builtin.stat:
+    path: "/var/lib/systemd/linger/{{ gitea_runner_service_user }}"
+  register: linger_stat
+
 - name: Enable lingering for runner user
   ansible.builtin.command: loginctl enable-linger {{ gitea_runner_service_user }}
-  changed_when: true
+  changed_when: not linger_stat.stat.exists
 
 - name: Ensure subuid entry for runner user
   ansible.builtin.lineinfile: