diff --git a/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md
similarity index 100%
rename from CODE_OF_CONDUCT.md
rename to .github/CODE_OF_CONDUCT.md
diff --git a/CONTRIBUTING.md b/.github/CONTRIBUTING.md
similarity index 77%
rename from CONTRIBUTING.md
rename to .github/CONTRIBUTING.md
index bff70cde..744a5bbe 100644
--- a/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -1,5 +1,5 @@
 * Bug reports and feature requests are welcome in [the issues][issues]
-* For questions and discussion there's the [Slack room][slack]
+* For questions and discussion there's the [Slack room][slack] ([invititation here][slackinvite])
 * Pull Requests are welcome. For more complex changes and features it's
   recommended to open an issue first
 * About 3 or 4 pull requests accepted one gets write access to the repo.
@@ -9,3 +9,4 @@
 
 [issues]: https://github.com/go-task/task/issues
 [slack]: https://gophers.slack.com/messages/task
+[slackinvite]: https://invite.slack.golangbridge.org/
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 00000000..fa6651e9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,9 @@
+<!--
+For questions and general talk there's the Slack room: https://gophers.slack.com/messages/task
+Invite to the Slack is available in this link: https://invite.slack.golangbridge.org/
+
+If relevant, include the following information:
+- Task version
+- OS
+- Example Taskfile showing the issue
+-->
diff --git a/README.md b/README.md
index 41fc1ece..2d23ed6a 100644
--- a/README.md
+++ b/README.md
@@ -514,10 +514,12 @@ so task know which files to watch.
   - [dogtools/dog][dog]
   - [goeuro/myke][myke]
   - [dreadl0ck/zeus][zeus]
+  - [rliebz/tusk][tusk]
 - Go based:
   - [go-godo/godo][godo]
   - [markbates/grift][grift]
   - [nstratos/make.go][make.go]
+  - [magefile/mage][mage]
 - Make based:
   - [tj/mmake][mmake]
 
@@ -529,9 +531,11 @@ so task know which files to watch.
 [dog]: https://github.com/dogtools/dog
 [myke]: https://github.com/goeuro/myke
 [zeus]: https://github.com/dreadl0ck/zeus
+[tusk]: https://github.com/rliebz/tusk
 [godo]: https://github.com/go-godo/godo
 [grift]: https://github.com/markbates/grift
 [make.go]: https://github.com/nstratos/make.go
+[mage]: https://github.com/magefile/mage
 [mmake]: https://github.com/tj/mmake
 [sh]: https://github.com/mvdan/sh
 [post-hugo]: https://blog.carlmjohnson.net/post/2017/hugo-asset-pipeline/