diff --git a/templates/webhook/new.tmpl b/templates/webhook/new.tmpl
index 0347455f2c..17eb578b0e 100644
--- a/templates/webhook/new.tmpl
+++ b/templates/webhook/new.tmpl
@@ -10,17 +10,33 @@
 	</div>
 </h4>
 <div class="ui attached segment">
-	{{template "repo/settings/webhook/forgejo" .ctxData}}
-	{{template "repo/settings/webhook/gitea" .ctxData}}
-	{{template "repo/settings/webhook/gogs" .ctxData}}
-	{{template "repo/settings/webhook/slack" .ctxData}}
-	{{template "repo/settings/webhook/discord" .ctxData}}
-	{{template "repo/settings/webhook/dingtalk" .ctxData}}
-	{{template "repo/settings/webhook/telegram" .ctxData}}
-	{{template "repo/settings/webhook/msteams" .ctxData}}
-	{{template "repo/settings/webhook/feishu" .ctxData}}
-	{{template "repo/settings/webhook/matrix" .ctxData}}
-	{{template "repo/settings/webhook/wechatwork" .ctxData}}
-	{{template "repo/settings/webhook/packagist" .ctxData}}
+	{{with .ctxData}}
+		<!-- the template argument cannot be dynamic  -->
+		{{if eq .HookType "forgejo"}}
+			{{template "webhook/new/forgejo" .}}
+		{{else if eq .HookType "gitea"}}
+			{{template "webhook/new/gitea" .}}
+		{{else if eq .HookType "gogs"}}
+			{{template "webhook/new/gogs" .}}
+		{{else if eq .HookType "slack"}}
+			{{template "webhook/new/slack" .}}
+		{{else if eq .HookType "discord"}}
+			{{template "webhook/new/discord" .}}
+		{{else if eq .HookType "dingtalk"}}
+			{{template "webhook/new/dingtalk" .}}
+		{{else if eq .HookType "telegram"}}
+			{{template "webhook/new/telegram" .}}
+		{{else if eq .HookType "msteams"}}
+			{{template "webhook/new/msteams" .}}
+		{{else if eq .HookType "feishu"}}
+			{{template "webhook/new/feishu" .}}
+		{{else if eq .HookType "matrix"}}
+			{{template "webhook/new/matrix" .}}
+		{{else if eq .HookType "wechatwork"}}
+			{{template "webhook/new/wechatwork" .}}
+		{{else if eq .HookType "packagist"}}
+			{{template "webhook/new/packagist" .}}
+		{{end}}
+	{{end}}
 </div>
 {{template "repo/settings/webhook/history" .ctxData}}
diff --git a/templates/repo/settings/webhook/dingtalk.tmpl b/templates/webhook/new/dingtalk.tmpl
similarity index 100%
rename from templates/repo/settings/webhook/dingtalk.tmpl
rename to templates/webhook/new/dingtalk.tmpl
diff --git a/templates/repo/settings/webhook/discord.tmpl b/templates/webhook/new/discord.tmpl
similarity index 100%
rename from templates/repo/settings/webhook/discord.tmpl
rename to templates/webhook/new/discord.tmpl
diff --git a/templates/repo/settings/webhook/feishu.tmpl b/templates/webhook/new/feishu.tmpl
similarity index 100%
rename from templates/repo/settings/webhook/feishu.tmpl
rename to templates/webhook/new/feishu.tmpl
diff --git a/templates/repo/settings/webhook/forgejo.tmpl b/templates/webhook/new/forgejo.tmpl
similarity index 100%
rename from templates/repo/settings/webhook/forgejo.tmpl
rename to templates/webhook/new/forgejo.tmpl
diff --git a/templates/repo/settings/webhook/gitea.tmpl b/templates/webhook/new/gitea.tmpl
similarity index 100%
rename from templates/repo/settings/webhook/gitea.tmpl
rename to templates/webhook/new/gitea.tmpl
diff --git a/templates/repo/settings/webhook/gogs.tmpl b/templates/webhook/new/gogs.tmpl
similarity index 100%
rename from templates/repo/settings/webhook/gogs.tmpl
rename to templates/webhook/new/gogs.tmpl
diff --git a/templates/repo/settings/webhook/matrix.tmpl b/templates/webhook/new/matrix.tmpl
similarity index 100%
rename from templates/repo/settings/webhook/matrix.tmpl
rename to templates/webhook/new/matrix.tmpl
diff --git a/templates/repo/settings/webhook/msteams.tmpl b/templates/webhook/new/msteams.tmpl
similarity index 100%
rename from templates/repo/settings/webhook/msteams.tmpl
rename to templates/webhook/new/msteams.tmpl
diff --git a/templates/repo/settings/webhook/packagist.tmpl b/templates/webhook/new/packagist.tmpl
similarity index 100%
rename from templates/repo/settings/webhook/packagist.tmpl
rename to templates/webhook/new/packagist.tmpl
diff --git a/templates/repo/settings/webhook/slack.tmpl b/templates/webhook/new/slack.tmpl
similarity index 100%
rename from templates/repo/settings/webhook/slack.tmpl
rename to templates/webhook/new/slack.tmpl
diff --git a/templates/repo/settings/webhook/telegram.tmpl b/templates/webhook/new/telegram.tmpl
similarity index 100%
rename from templates/repo/settings/webhook/telegram.tmpl
rename to templates/webhook/new/telegram.tmpl
diff --git a/templates/repo/settings/webhook/wechatwork.tmpl b/templates/webhook/new/wechatwork.tmpl
similarity index 100%
rename from templates/repo/settings/webhook/wechatwork.tmpl
rename to templates/webhook/new/wechatwork.tmpl