diff --git a/roles/gitea/tasks/main.yml b/roles/gitea/tasks/main.yml
index 46f9972..788e0a8 100644
--- a/roles/gitea/tasks/main.yml
+++ b/roles/gitea/tasks/main.yml
@@ -1,19 +1,25 @@
 ---
-- name: Check for Gitea gpg key
-  stat:
-    path: /etc/apt/trusted.gpg.d/morph027-gitea.gpg
-  register: gitea_key
+- name: Check if Gitea is installed
+  shell: gitea --version
+  register: validate_gitea
+  changed_when: false
 
 - name: Add Gitea key && repository
   block:
+    - name: Check for Gitea gpg key
+      stat:
+        path: /etc/apt/trusted.gpg.d/morph027-gitea.gpg
+      register: gitea_key
+
     - name: Import Gitea key
       shell: curl -s https://packaging.gitlab.io/gitea/gpg.key | sudo gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/morph027-gitea.gpg --import && sudo chmod 644 /etc/apt/trusted.gpg.d/morph027-gitea.gpg
+      when: gitea_key.stat.exists == false or gitea_key.stat.mode != "0644"
 
     - name: Add Gitea repository
       apt_repository:
         filename: morph027-gitea
         repo: deb https://packaging.gitlab.io/gitea gitea main
-  when: gitea_key.stat.exists == false or gitea_key.stat.mode != "0644"
+  when: '"not found" in validate_gitea.stdout'
 
 - name: Install Gitea
   package:
@@ -22,7 +28,7 @@
 
 - name: Configure Gitea
   template:
-    src: app.ini
+    src: templates/app.ini
     dest: /etc/gitea/app.ini
     owner: gitea
     force: no # we don't want to kill our existing config D: