diff --git a/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/main.yml b/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/main.yml
index e637df1..71f6759 100644
--- a/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/main.yml
+++ b/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/main.yml
@@ -59,3 +59,8 @@
         path: /opt/metacluster/container_images
         state: absent
 
+- name: Cleanup tempfile
+  ansible.builtin.file:
+    path: "{{ kubeconfig.path }}"
+    state: absent
+  when: kubeconfig.path is defined
diff --git a/ansible/roles/metacluster/tasks/components.yml b/ansible/roles/metacluster/tasks/components.yml
index 6bd0cf6..017ac4f 100644
--- a/ansible/roles/metacluster/tasks/components.yml
+++ b/ansible/roles/metacluster/tasks/components.yml
@@ -24,7 +24,7 @@
 - name: Parse helm charts for container images
   ansible.builtin.shell:
     cmd: "{{ item.value.helm.parse_logic }}"
-    chdir: /opt/metacluster/helm-charts/{{ item.key }}
+    chdir: /opt/metacluster/helm-charts/{{ item.value.helm.basedir | default(item.key) }}
   register: containerimages
   loop: "{{ lookup('ansible.builtin.dict', components) }}"
   loop_control:
diff --git a/ansible/vars/metacluster.yml b/ansible/vars/metacluster.yml
index 30e0fd9..29346f2 100644
--- a/ansible/vars/metacluster.yml
+++ b/ansible/vars/metacluster.yml
@@ -8,6 +8,8 @@ platform:
       url: https://charts.longhorn.io
     - name: harbor
       url: https://helm.goharbor.io
+    - name: gitea-charts
+      url: https://dl.gitea.io/charts/
     - name: argo
       url: https://argoproj.github.io/argo-helm
 
@@ -25,6 +27,13 @@ components:
       chart: harbor/harbor
       parse_logic: helm template . | yq --no-doc eval '.. | .image? | select(.)' | sort -u | awk '!/ /'
 
+  gitea:
+    helm:
+      version: v5.0.9 # (= Gitea v1.16.8)
+      chart: gitea-charts/gitea
+      basedir: helm-chart
+      parse_logic: helm template . | yq --no-doc eval '.. | .image? | select(.)' | sort -u | awk '!/ /'
+
   argo-cd:
     helm:
       version: 4.9.7  # (= ArgoCD v2.4.2)