diff --git a/playbooks/roles/gitea-git-repos/tasks/setup-org.yaml b/playbooks/roles/gitea-git-repos/tasks/setup-org.yaml
index 5a40b83e27..a4938842e1 100644
--- a/playbooks/roles/gitea-git-repos/tasks/setup-org.yaml
+++ b/playbooks/roles/gitea-git-repos/tasks/setup-org.yaml
@@ -53,4 +53,4 @@
   register: gitea_org_repo_list
 - name: Parse org repo list
   set_fact:
-    gitea_org_repos: "{{ gitea_org_repo_list.json | map(attribute='name') | list }}"
+    gitea_repos: "{{ gitea_org_repo_list.json | map(attribute='full_name') | list + gitea_repos | default([]) }}"
diff --git a/playbooks/roles/gitea-git-repos/tasks/setup-repo.yaml b/playbooks/roles/gitea-git-repos/tasks/setup-repo.yaml
index 7a732556b4..76202b613b 100644
--- a/playbooks/roles/gitea-git-repos/tasks/setup-repo.yaml
+++ b/playbooks/roles/gitea-git-repos/tasks/setup-repo.yaml
@@ -6,7 +6,7 @@
     org: "{{ project.project | regex_replace('^(.*)/(.*)$', '\\1') }}"
     repo: "{{ project.project | regex_replace('^(.*)/(.*)$', '\\2') }}"
 - name: Create repo
-  when: repo not in gitea_org_repos
+  when: project.project not in gitea_repos
   uri:
     url: "{{ gitea_url }}/api/v1/org/{{ org }}/repos"
     user: root