diff --git a/tasks/config/gitea-server.yml b/tasks/config/gitea-server.yml
index 947b745..5050824 100644
--- a/tasks/config/gitea-server.yml
+++ b/tasks/config/gitea-server.yml
@@ -1,21 +1,21 @@
 # vim: set filetype=yaml.ansible #
 ---
 - name: Set gitea server version
-  ansible.builtin.set_facts:
+  ansible.builtin.set_fact:
     gitea_server:
-      vers: "{{ pkgconfig.gitea-server.version }}"
+      vers: "{{ pkgconfig.gitea_server.version }}"
 
 - name: Set gitea server url and filename
-  ansible.builtin.set_facts:
+  ansible.builtin.set_fact:
     gitea_server:
       vers: "{{ gitea_server.vers }}"
-      url: "{{ pkgconfig.gitea-server.baseurl }}/{{ gitea_server.vers }}"
-      file: "gitea-{{ gitea_server.vers }}-{{ pkgconfig.gitea-server.os[ansible_os_family] }}-{{ pkgconfig.gitea-server.arch[ansible_architecture] }}"
+      url: "{{ pkgconfig.gitea_server.baseurl }}/{{ gitea_server.vers }}"
+      file: "gitea-{{ gitea_server.vers }}-{{ pkgconfig.gitea_server.os[ansible_system] }}-{{ pkgconfig.gitea_server.arch[ansible_architecture] }}"
 
 - name: Set gitea server sha256sum url
-  ansible.builtin.set_facts:
+  ansible.builtin.set_fact:
     gitea_server:
       vers: "{{ gitea_server.vers }}"
       url: "{{ gitea_server.url }}"
       file: "{{ gitea_server.file }}"
-      sha256url: "sha256:{{ pkgconfig.gitea-server.baseurl }}/{{ gitea_server.file }}.sha256"
+      sha256url: "sha256:{{ pkgconfig.gitea_server.baseurl }}/{{ gitea_server.vers }}/{{ gitea_server.file }}.sha256"
diff --git a/tasks/pkgs/gitea-server.yml b/tasks/pkgs/gitea-server.yml
index dd32d75..c657ff7 100644
--- a/tasks/pkgs/gitea-server.yml
+++ b/tasks/pkgs/gitea-server.yml
@@ -1,9 +1,7 @@
 # vim: filetype=yaml.ansible :
 ---
-- name: Load gitea-server config
-  when:
-    - gitea_server not defined
-  ansible.bulitin.include_tasks:
+- name: Load gitea-server configuration
+  ansible.builtin.include_tasks:
     file: config/gitea-server.yml
 
 - name: Download gitea-server binary
diff --git a/vars/pkgs/gitea-server.yml b/vars/pkgs/gitea-server.yml
index 47d70c5..c57fbbd 100644
--- a/vars/pkgs/gitea-server.yml
+++ b/vars/pkgs/gitea-server.yml
@@ -1,4 +1,4 @@
-gitea-server:
+gitea_server:
   version: 1.23.7
   baseurl: https://dl.gitea.com/gitea
   os: