diff --git a/roles/server/gitea/defaults/main.yml b/roles/server/gitea/defaults/main.yml
index 5e4bdcd..b290ba4 100644
--- a/roles/server/gitea/defaults/main.yml
+++ b/roles/server/gitea/defaults/main.yml
@@ -6,14 +6,14 @@ description: "{{ domain }} Gitea"
 gitea_system_user: "{{ domain | regex_replace('[^A-Za-z0-9-]+', '-') }}"
 gitea_service_name: "{{ domain }}.service"
 
-gitea_user_directory: "{{ global_webservers_directory }}/{{ domain }}"
-gitea_installation_directory: "{{ gitea_user_directory }}/bin"
+user_directory: "{{ global_webservers_directory }}/{{ domain }}"
+gitea_installation_directory: "{{ user_directory }}/bin"
 gitea_custom_directory: "{{ gitea_installation_directory }}/custom"
-gitea_data_directory: "{{ gitea_user_directory }}/data"
-gitea_repositories_directory: "{{ gitea_user_directory }}/repositories"
+gitea_data_directory: "{{ user_directory }}/data"
+gitea_repositories_directory: "{{ user_directory }}/repositories"
 gitea_lfs_directory: "{{ gitea_data_directory }}/lfs"
 gitea_binary_path: "{{ gitea_installation_directory }}/gitea"
-gitea_socket_path: "{{ gitea_user_directory }}/gitea.socket"
+gitea_socket_path: "{{ user_directory }}/gitea.socket"
 gitea_configuration_path: "{{ gitea_custom_directory }}/app.ini"
 
 database_user: "gitea"
diff --git a/roles/server/gitea/tasks/main.yml b/roles/server/gitea/tasks/main.yml
index b881eab..82a149e 100644
--- a/roles/server/gitea/tasks/main.yml
+++ b/roles/server/gitea/tasks/main.yml
@@ -14,11 +14,11 @@
     name: "{{ gitea_system_user }}"
     system: yes
     shell: /bin/bash # Required for ssh access
-    home: "{{ gitea_user_directory }}"
+    home: "{{ user_directory }}"
 
 - name: Configure user directory
   file:
-    path: "{{ gitea_user_directory }}"
+    path: "{{ user_directory }}"
     state: directory
     owner: "{{ gitea_system_user }}"
     group: "{{ nginx_system_user }}"
diff --git a/roles/server/gitea/templates/app.ini b/roles/server/gitea/templates/app.ini
index 1e17b7b..eed1d17 100644
--- a/roles/server/gitea/templates/app.ini
+++ b/roles/server/gitea/templates/app.ini
@@ -148,7 +148,7 @@ SSH_DOMAIN = %(DOMAIN)s
 ; Port number to be exposed in clone URL
 SSH_PORT = 22
 ; Root path of SSH directory, default is '~/.ssh', but you have to use '/home/git/.ssh'.
-SSH_ROOT_PATH = {{ gitea_user_directory }}/.ssh
+SSH_ROOT_PATH = {{ user_directory }}/.ssh
 ; Gitea will create a authorized_keys file by default when it is not using the internal ssh server
 ; If you intend to use the AuthorizedKeysCommand functionality then you should turn this off.
 SSH_CREATE_AUTHORIZED_KEYS_FILE = true
diff --git a/roles/server/gitea/templates/gitea.service b/roles/server/gitea/templates/gitea.service
index d19bcc3..344629d 100644
--- a/roles/server/gitea/templates/gitea.service
+++ b/roles/server/gitea/templates/gitea.service
@@ -19,7 +19,7 @@ WorkingDirectory={{ gitea_installation_directory }}
 ExecStart="{{ gitea_binary_path }}" web -c "{{ gitea_configuration_path }}"
 Restart=always
 Environment="USER={{ gitea_system_user }}"
-Environment="HOME={{ gitea_user_directory }}"
+Environment="HOME={{ user_directory }}"
 Environment="GITEA_WORK_DIR={{ gitea_installation_directory }}"
 
 [Install]