diff --git a/ansible/post-deploy.yml b/ansible/post-deploy.yml
index c75b6fd..97daa0b 100644
--- a/ansible/post-deploy.yml
+++ b/ansible/post-deploy.yml
@@ -73,6 +73,15 @@
       register: git_auth_keys
       become: true
 
+    - name: Check if the public key is already in place
+      lineinfile:
+        path: /var/lib/gitea/git/.ssh/authorized_keys
+        regexp: "^{{ git_id_rsa_pub.stdout }}"
+        state: absent
+      check_mode: true
+      changed_when: false
+      register: git_id_rsa_pub_check
+
     - name: Ensure git public key is in gitea loaded authorized_keys
       blockinfile:
         path: /var/lib/gitea/git/.ssh/authorized_keys
@@ -85,6 +94,7 @@
         backup: true
         marker: "# ansible inserted git <-> gitea public key"
       become: true
+      when: git_id_rsa_pub_check.found
 
     - name: Symlink the gitea authorized keys configuration to the host git user
       file: