diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 00000000..0c436664
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,11 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Box Developer Community
+    url: https://forum.box.com
+    about: Before creating an issue, I have searched the Box Developer Community and my issue isn't already reported there.
+  - name: Issues
+    url: https://github.com/box/box-openapi/issues
+    about: Before creating an issue, I have searched Issues in this repository and my issue isn't already reported there.
+  - name: API Reference
+    url: https://developer.box.com/reference
+    about: Before creating an issue, I have checked that the API documentation doesn't solve my issue.
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/docs.yaml b/.github/ISSUE_TEMPLATE/docs.yml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/docs.yaml
rename to .github/ISSUE_TEMPLATE/docs.yml
diff --git a/.github/ISSUE_TEMPLATE/mistake.md b/.github/ISSUE_TEMPLATE/mistake.md
deleted file mode 100644
index 1fdf1616..00000000
--- a/.github/ISSUE_TEMPLATE/mistake.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: Report a typo/error
-about: Report a typo or error found in specification
-title: ''
-labels: bug
-assignees: cbetta
----
-
-## Description of the issue
-
-<!-- Replace this text with a description of what issue you have discovered -->
-<!-- Please include as to why you think the issue is an issue. -->
-<!-- If you are a Boxer, let us know  -->
-<!-- If possible, try apply the fix yourself and provide us with a Pull Request -->
-
-## Current content
-<!-- What does the specification currently say? -->
-
-## Expected content
-<!-- What do you think the specification should say instead? -->
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
deleted file mode 100644
index 292d7a20..00000000
--- a/.github/ISSUE_TEMPLATE/question.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-name: Question
-about: Ask for assistance
-title: ''
-question: bug
-assignees: cbetta
----
-
-- [ ] I have checked that the [API documentation][api-docs] doesn't solve my issue.
-- [ ] I have searched the [Box Developer Forums][dev-forums] and my question
-  isn't already  reported (or if it has been reported, I have attached a link to
-  it, for reference).
-- [ ] I have searched [Issues in this repository][github-repo] and my question
-  isn't already reported.
-
-## Your question
-<!-- Replace this text with a description of what question you have -->
-<!-- Please include as much detail as possible -->
-
-[api-docs]: https://developer.box.com/
-[dev-forums]: https://community.box.com/t5/Platform-and-Development-Forum/bd-p/DeveloperForum
-[github-repo]: https://github.com/box/box-openapi/search?type=Issues
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 6a8f2fe9..ab41bccd 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -16,7 +16,7 @@ Re `APIWG-#` (`Jira` ticket)
 - [ ] I have performed a self-review of my own changes
 - [ ] I have run `yarn lint` to make sure my changes pass all linters
 - [ ] I have pulled the latest changes from the upstream developer branch
-- [ ] I have run `yarn build:schema` and included changes in `openapi.json` file if any
+- [ ] I have run `yarn build:schema` and included changes in `openapi.json`
 
 ## Contribution guidelines