diff --git a/roles/gitea/defaults/main.yml b/roles/gitea/defaults/main.yml
index 28ff33985..16e6fbb72 100644
--- a/roles/gitea/defaults/main.yml
+++ b/roles/gitea/defaults/main.yml
@@ -4,8 +4,6 @@
 
 # Information needed to install Gitea
 gitea_version: "1.6"
-gitea_install_path: "/usr/local/bin/gitea"
-
 iset_suffixes:
   i386: "386"
   x86_64: "amd64"
@@ -17,9 +15,16 @@ gitea_iset_suffix: "{{ iset_suffixes[ansible_architecture | default("unknown arc
 gitea_download_url: "https://dl.gitea.io/gitea/{{ gitea_version }}/gitea-{{ gitea_version }}-linux-{{ gitea_iset_suffix }}"
 gitea_integrity_url: "{{ gitea_download_url }}.asc"
 
+gitea_root_directory: "/library/gitea"
+gitea_install_path: "{{ gitea_root_directory }}/bin/gitea-{{ gitea_version }}"
+gitea_checksum_path: "{{ gitea_root_directory }}/bin/gitea-{{ gitea_version }}.asc"
+
+gitea_link_path: "{{ gitea_root_directory }}/gitea"
+
 # Information needed to run Gitea
 gitea_user: gitea
-gitea_run_directory: /var/lib/gitea
+gitea_run_directory: "{{ gitea_root_directory }}"
+gitea_db_directory: "/library/dbdata/gitea"
 
 gitea_install: True
 gitea_enabled: True
diff --git a/roles/gitea/tasks/install.yml b/roles/gitea/tasks/install.yml
index c5ee4be1a..d537b097f 100644
--- a/roles/gitea/tasks/install.yml
+++ b/roles/gitea/tasks/install.yml
@@ -1,3 +1,10 @@
+- name: Create Gitea root directory
+  file:
+    path: "{{ gitea_root_directory }}"
+    state: directory
+    # owner: gitea
+    # group: gitea
+
 - name: Download Gitea binary
   get_url:
     url: "{{ gitea_download_url }}"
@@ -10,7 +17,7 @@
 - name: Download Gitea GPG signature
   get_url:
     url: "{{ gitea_integrity_url }}"
-    dest: "{{ gitea_install_path }}.asc"
+    dest: "{{ gitea_checksum_path }}"
   tags:
     - install
   when: internet_available
@@ -18,9 +25,10 @@
 - name: Verify Gitea binary with GPG signature
   shell: |
     gpg --keyserver pgp.mit.edu --recv 7C9E68152594688862D62AF62D9AE806EC1592E2
-    gpg --verify {{ gitea_install_path }}.asc {{ gitea_install_path }}
+    gpg --verify {{ gitea_checksum_path }} {{ gitea_install_path }}
   tags:
     - install
+    - verify
 
 - name: Create 'gitea' service
   template: