diff --git a/routers/repo/issue.go b/routers/repo/issue.go
index edc6219d3..a43a3d992 100644
--- a/routers/repo/issue.go
+++ b/routers/repo/issue.go
@@ -50,8 +50,11 @@ var (
 	// IssueTemplateCandidates issue templates
 	IssueTemplateCandidates = []string{
 		"ISSUE_TEMPLATE.md",
-		".gogs/ISSUE_TEMPLATE.md",
+		"issue_template.md",
+		".gitea/ISSUE_TEMPLATE.md",
+		".gitea/issue_template.md",
 		".github/ISSUE_TEMPLATE.md",
+		".github/issue_template.md",
 	}
 )
 
diff --git a/routers/repo/pull.go b/routers/repo/pull.go
index 583f3b0a3..56a6a79f6 100644
--- a/routers/repo/pull.go
+++ b/routers/repo/pull.go
@@ -31,9 +31,12 @@ const (
 
 var (
 	pullRequestTemplateCandidates = []string{
-		"PULL_REQUEST.md",
-		".gogs/PULL_REQUEST.md",
-		".github/PULL_REQUEST.md",
+		"PULL_REQUEST_TEMPLATE.md",
+		"pull_request_template.md",
+		".gitea/PULL_REQUEST_TEMPLATE.md",
+		".gitea/pull_request_template.md",
+		".github/PULL_REQUEST_TEMPLATE.md",
+		".github/pull_request_template.md",
 	}
 )