diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE/01_bug.md
similarity index 100%
rename from .github/PULL_REQUEST_TEMPLATE.md
rename to .github/PULL_REQUEST_TEMPLATE/01_bug.md
diff --git a/.github/PULL_REQUEST_TEMPLATE/02_enhance.md b/.github/PULL_REQUEST_TEMPLATE/02_enhance.md
new file mode 100644
index 000000000000..79ca97dfa0ed
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE/02_enhance.md
@@ -0,0 +1,17 @@
+<!-- ℹ お読みください / README
+PRありがとうございます！ PRを作成する前に、コントリビューションガイドをご確認ください:
+Thank you for your PR! Before creating a PR, please check the contribution guide:
+https://github.com/misskey-dev/misskey/blob/develop/CONTRIBUTING.md
+-->
+
+# What
+<!-- このPRで何をしたのか？ どう変わるのか？ -->
+<!-- What did you do with this PR? How will it change things? -->
+
+# Why
+<!-- なぜそうするのか？ どういう意図なのか？ 何が困っているのか？ -->
+<!-- Why do you do it? What are your intentions? What is the problem? -->
+
+# Additional info (optional)
+<!-- テスト観点など -->
+<!-- Test perspective, etc -->
diff --git a/.github/PULL_REQUEST_TEMPLATE/03_release.md b/.github/PULL_REQUEST_TEMPLATE/03_release.md
new file mode 100644
index 000000000000..0c71ea804d2b
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE/03_release.md
@@ -0,0 +1,10 @@
+# Summary
+This is a release PR.
+
+For more information on the release instructions, please see:
+https://github.com/misskey-dev/misskey/blob/develop/CONTRIBUTING.md#release
+
+# Checklist
+- [ ] package.jsonのバージョンが正しく更新されている
+- [ ] CHANGELOGが過不足無く更新されている
+- [ ] CIが全て通っている
diff --git a/locales/en-US.yml b/locales/en-US.yml
index 9c19cb03eaa5..1ee562091687 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -805,6 +805,7 @@ lastCommunication: "Last communication"
 resolved: "Resolved"
 unresolved: "Unresolved"
 breakFollow: "Remove follower"
+breakFollowConfirm: "Are you sure want to remove follower?"
 itsOn: "Enabled"
 itsOff: "Disabled"
 emailRequiredForSignup: "Require email address for sign-up"
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 8a0430936046..0fcf85ac0df8 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -812,6 +812,7 @@ lastCommunication: "直近の通信"
 resolved: "解決済み"
 unresolved: "未解決"
 breakFollow: "フォロワーを解除"
+breakFollowConfirm: "フォロワー解除しますか？"
 itsOn: "オンになっています"
 itsOff: "オフになっています"
 emailRequiredForSignup: "アカウント登録にメールアドレスを必須にする"
diff --git a/packages/frontend/src/scripts/get-user-menu.ts b/packages/frontend/src/scripts/get-user-menu.ts
index 557b257f6248..313dddc5b14a 100644
--- a/packages/frontend/src/scripts/get-user-menu.ts
+++ b/packages/frontend/src/scripts/get-user-menu.ts
@@ -102,6 +102,8 @@ export function getUserMenu(user, router: Router = mainRouter) {
 	}
 
 	async function invalidateFollow() {
+		if (!await getConfirmed(i18n.ts.breakFollowConfirm)) return;
+
 		os.apiWithDialog('following/invalidate', {
 			userId: user.id,
 		}).then(() => {