diff --git a/roles/essential/tasks/main.yml b/roles/essential/tasks/main.yml
index 687fa8e..46b7099 100644
--- a/roles/essential/tasks/main.yml
+++ b/roles/essential/tasks/main.yml
@@ -1,17 +1,4 @@
 ---
-# TODO: make idempotent
-- name: Add Gitea repo 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
-
-# TODO: make idempotent
-- name: Set key perms
-  shell: sudo chmod 644 /etc/apt/trusted.gpg.d/morph027-gitea.gpg
-
-- name: Add Gitea repo
-  apt_repository:
-    filename: morph027-gitea
-    repo: deb https://packaging.gitlab.io/gitea gitea main
-
 - name: Upgrade Packages
   apt:
     update_cache: yes
@@ -21,7 +8,6 @@
   package:
     name:
       - hugo
-      - gitea
       - git
       - nginx
       - tor
diff --git a/roles/gitea/tasks/main.yml b/roles/gitea/tasks/main.yml
index 83f1756..46f9972 100644
--- a/roles/gitea/tasks/main.yml
+++ b/roles/gitea/tasks/main.yml
@@ -1,4 +1,25 @@
 ---
+- name: Check for Gitea gpg key
+  stat:
+    path: /etc/apt/trusted.gpg.d/morph027-gitea.gpg
+  register: gitea_key
+
+- name: Add Gitea key && repository
+  block:
+    - 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
+
+    - 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"
+
+- name: Install Gitea
+  package:
+    name:
+      - gitea
+
 - name: Configure Gitea
   template:
     src: app.ini