diff --git a/.github/ISSUE_TEMPLATE/blank-issue.md b/.github/ISSUE_TEMPLATE/blank-issue.md
new file mode 100644
index 0000000000..9aef3ebe63
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/blank-issue.md
@@ -0,0 +1,4 @@
+---
+name: Blank Issue
+about: Create a blank issue.
+---
diff --git a/cranelift/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/clif-bug-report.md
similarity index 85%
rename from cranelift/.github/ISSUE_TEMPLATE/bug-report.md
rename to .github/ISSUE_TEMPLATE/clif-bug-report.md
index 8038372339..3efc27d4f1 100644
--- a/cranelift/.github/ISSUE_TEMPLATE/bug-report.md
+++ b/.github/ISSUE_TEMPLATE/clif-bug-report.md
@@ -1,10 +1,10 @@
 ---
-name: "Bug report"
+name: "Cranelift Bug report"
 about: "Report a bug or a crash in Cranelift."
 labels: 'bug'
 ---
 
-Thanks for opening a bug report on Cranelift! Please answer the questions below
+Thanks for opening a bug report! Please answer the questions below
 if they're relevant and delete this text before submitting.
 
 - What are the steps to reproduce the issue? Can you include a CLIF test case,
diff --git a/cranelift/.github/ISSUE_TEMPLATE/improvement.md b/.github/ISSUE_TEMPLATE/improvement.md
similarity index 53%
rename from cranelift/.github/ISSUE_TEMPLATE/improvement.md
rename to .github/ISSUE_TEMPLATE/improvement.md
index 2cc9857213..a4c6009249 100644
--- a/cranelift/.github/ISSUE_TEMPLATE/improvement.md
+++ b/.github/ISSUE_TEMPLATE/improvement.md
@@ -3,25 +3,26 @@ name: "Improvement"
 about: "A feature request or code improvement."
 ---
 
-<!-- Please try to describe precisely what you would like to do in Cranelift and/or
-expect from it. You can answer the questions below if they're relevant and
-delete this text before submitting. Thanks for opening an issue! -->
+<!-- Please try to describe precisely what you would like to do in
+Cranelift/Wasmtime and/or expect from it. You can answer the questions below if
+they're relevant and delete this text before submitting. Thanks for opening an
+issue! -->
 
 #### Feature
 
-<!-- What is the feature or code improvement you would like to do in Cranelift? -->
-
+<!-- What is the feature or code improvement you would like to do in
+Cranelift/Wasmtime? -->
 
 #### Benefit
 
-<!-- What is the value of adding this in Cranelift? -->
-
+<!-- What is the value of adding this in Cranelift/Wasmtime? -->
 
 #### Implementation
 
-<!-- Do you have an implementation plan, and/or ideas for data structures or algorithms to use? -->
-
+<!-- Do you have an implementation plan, and/or ideas for data structures or
+algorithms to use? -->
 
 #### Alternatives
 
-<!-- Have you considered alternative implementations? If so, how are they better or worse than your proposal? -->
+<!-- Have you considered alternative implementations? If so, how are they
+better or worse than your proposal? -->
diff --git a/cranelift/.github/pull_request_template.md b/.github/pull_request_template.md
similarity index 50%
rename from cranelift/.github/pull_request_template.md
rename to .github/pull_request_template.md
index d125ec7a7f..18ad42fa5b 100644
--- a/cranelift/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,3 +1,8 @@
+<!--
+
+Please ensure that the following steps are all taken care of before submitting
+the PR.
+
 - [ ] This has been discussed in issue #..., or if not, please tell us why
   here.
 - [ ] A short description of what this does, why it is needed; if the
@@ -5,8 +10,9 @@
   first.
 - [ ] This PR contains test cases, if meaningful.
 - [ ] A reviewer from the core maintainer team has been assigned for this PR.
-  If you don't know who could review this, please indicate so and/or ping
-  `bnjbvr`. The list of suggested reviewers on the right can help you.
+  If you don't know who could review this, please indicate so. The list of
+  suggested reviewers on the right can help you.
 
-<!-- Please ensure all communication adheres to the [code of
-conduct](https://github.com/CraneStation/cranelift/blob/master/CODE_OF_CONDUCT.md). -->
+Please ensure all communication adheres to the [code of
+conduct](https://github.com/bytecodealliance/wasmtime/blob/master/CODE_OF_CONDUCT.md).
+-->