diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index c5ed2f876..adb1394b5 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -8,9 +8,21 @@ assignees: ''
 ---
 
 <!--
-Please note that Flux v1 is in maintenance mode: https://github.com/fluxcd/flux/issues/3320
+# ---- NOTICE -----
+
+Flux v1 is in maintenance mode and Flux v2 is getting closer to GA.
+If you want to learn about migrating to Flux v2, please review
+<https://github.com/fluxcd/flux2/discussions/413>.
+
+As it will take longer until we get around to issues and PRs in
+Flux v1, we strongly recommend that you starting familiaring yourself
+with Flux v2: <https://toolkit.fluxcd.io/>
+
+This means that new features will only be added after very careful
+consideration, if at all. Refer to the links above for more detail.
+
+# ---- END NOTICE -----
 
-This means that new features will only be added after very careful consideration, if at all. Refer to the issue above for more detail.
 -->
 
 
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index d07dd3604..bc17c4327 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,10 +1,20 @@
 <!--
-# Notice
-Flux is in maintenance mode, and it will take a bit
-longer until we get around to issues and PRs.
 
-For more information, and details about Flux's future,
-see: https://github.com/fluxcd/flux/issues/3320
+# ---- NOTICE -----
+
+Flux v1 is in maintenance mode and Flux v2 is getting closer to GA.
+If you want to learn about migrating to Flux v2, please review
+<https://github.com/fluxcd/flux2/discussions/413>.
+
+As it will take longer until we get around to issues and PRs in
+Flux v1, we strongly recommend that you starting familiaring yourself
+with Flux v2: <https://toolkit.fluxcd.io/>
+
+This means that new features will only be added after very careful
+consideration, if at all. Refer to the links above for more detail.
+
+# ---- END NOTICE -----
+
 
 # General contribution criteria