diff --git a/roles/authelia-for-gitea/defaults/main.json b/roles/authelia-for-forgejo/defaults/main.json
similarity index 100%
rename from roles/authelia-for-gitea/defaults/main.json
rename to roles/authelia-for-forgejo/defaults/main.json
diff --git a/roles/authelia-for-gitea/info.md b/roles/authelia-for-forgejo/info.md
similarity index 100%
rename from roles/authelia-for-gitea/info.md
rename to roles/authelia-for-forgejo/info.md
diff --git a/roles/authelia-for-gitea/tasks/main.json b/roles/authelia-for-forgejo/tasks/main.json
similarity index 100%
rename from roles/authelia-for-gitea/tasks/main.json
rename to roles/authelia-for-forgejo/tasks/main.json
diff --git a/roles/authelia-for-gitea/templates/authelia-client-conf.json.j2 b/roles/authelia-for-forgejo/templates/authelia-client-conf.json.j2
similarity index 100%
rename from roles/authelia-for-gitea/templates/authelia-client-conf.json.j2
rename to roles/authelia-for-forgejo/templates/authelia-client-conf.json.j2
diff --git a/roles/gitea-and-nginx/defaults/main.json b/roles/forgejo-and-nginx/defaults/main.json
similarity index 100%
rename from roles/gitea-and-nginx/defaults/main.json
rename to roles/forgejo-and-nginx/defaults/main.json
diff --git a/roles/gitea-and-nginx/info.md b/roles/forgejo-and-nginx/info.md
similarity index 100%
rename from roles/gitea-and-nginx/info.md
rename to roles/forgejo-and-nginx/info.md
diff --git a/roles/gitea-and-nginx/tasks/main.json b/roles/forgejo-and-nginx/tasks/main.json
similarity index 100%
rename from roles/gitea-and-nginx/tasks/main.json
rename to roles/forgejo-and-nginx/tasks/main.json
diff --git a/roles/gitea-and-nginx/templates/conf.j2 b/roles/forgejo-and-nginx/templates/conf.j2
similarity index 100%
rename from roles/gitea-and-nginx/templates/conf.j2
rename to roles/forgejo-and-nginx/templates/conf.j2
diff --git a/roles/gitea-and-nginx/vardef.json b/roles/forgejo-and-nginx/vardef.json
similarity index 100%
rename from roles/gitea-and-nginx/vardef.json
rename to roles/forgejo-and-nginx/vardef.json
diff --git a/roles/gitea/defaults/main.json b/roles/forgejo/defaults/main.json
similarity index 100%
rename from roles/gitea/defaults/main.json
rename to roles/forgejo/defaults/main.json
diff --git a/roles/gitea/info.md b/roles/forgejo/info.md
similarity index 100%
rename from roles/gitea/info.md
rename to roles/forgejo/info.md
diff --git a/roles/gitea/tasks/main.json b/roles/forgejo/tasks/main.json
similarity index 100%
rename from roles/gitea/tasks/main.json
rename to roles/forgejo/tasks/main.json
diff --git a/roles/gitea/templates/config.ini.j2 b/roles/forgejo/templates/config.ini.j2
similarity index 100%
rename from roles/gitea/templates/config.ini.j2
rename to roles/forgejo/templates/config.ini.j2
diff --git a/roles/gitea/templates/systemd-unit.j2 b/roles/forgejo/templates/systemd-unit.j2
similarity index 100%
rename from roles/gitea/templates/systemd-unit.j2
rename to roles/forgejo/templates/systemd-unit.j2
diff --git a/roles/gitea/vardef.json b/roles/forgejo/vardef.json
similarity index 100%
rename from roles/gitea/vardef.json
rename to roles/forgejo/vardef.json
diff --git a/roles/postgresql-for-gitea/defaults/main.json b/roles/postgresql-for-forgejo/defaults/main.json
similarity index 100%
rename from roles/postgresql-for-gitea/defaults/main.json
rename to roles/postgresql-for-forgejo/defaults/main.json
diff --git a/roles/postgresql-for-gitea/tasks/main.json b/roles/postgresql-for-forgejo/tasks/main.json
similarity index 100%
rename from roles/postgresql-for-gitea/tasks/main.json
rename to roles/postgresql-for-forgejo/tasks/main.json