diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index a6afca6c..5d149aa7 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -83,5 +83,5 @@ There are more details about processes and workflow in the
 [commits]: https://www.conventionalcommits.org/en/v1.0.0/
 [conduct]: https://slackhq.github.io/code-of-conduct
 [empathy]: https://slack.engineering/on-empathy-pull-requests-979e4257d158#.awxtvmb2z
-[issues]: /issues/new
+[issues]: https://github.com/slackapi/slack-cli/issues/new/choose
 [maintainers]: ./MAINTAINERS_GUIDE.md
diff --git a/README.md b/README.md
index e8a59f4f..e4b76b63 100644
--- a/README.md
+++ b/README.md
@@ -57,7 +57,7 @@ Thanks for stopping by! You're awesome :sunglasses:
 [dev]: https://github.com/slackapi/slack-cli/releases/tag/dev-build
 [enhancements]: https://github.com/slackapi/slack-cli/pulls
 [install]: https://docs.slack.dev/tools/slack-cli/guides/installing-the-slack-cli-for-mac-and-linux
-[issues]: https://github.com/slackapi/slack-cli/issues/new?template=04_bug.md
+[issues]: https://github.com/slackapi/slack-cli/issues/new?template=01-bug.yml
 [maintainers]: .github/MAINTAINERS_GUIDE.md
 [releases]: https://github.com/slackapi/slack-cli/releases
-[suggestions]: https://github.com/slackapi/slack-cli/issues/new?template=02_enhancement.md
+[suggestions]: https://github.com/slackapi/slack-cli/issues/new?template=02-feature.yml