diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index ba4c2ddea..061399a0d 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1 @@
-* @CircleCI-Public/dx-internal
+* @CircleCI-Public/dx-clients
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 000000000..8995f4953
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,17 @@
+- [ ] I have our [Contribution Guidelines](./CONTRIBUTING.md).
+- [ ] I checked for similar issues and didn't find anything relevant.
+- [ ] This is not a security issue (which should be reported here: https://circleci.com/security/)
+
+**Do you want to request a *feature* or report a *bug*?**
+
+**What is the current behavior?**
+
+Can you provide an example?
+
+**What is the expected behavior?**
+
+**Which version of the CLI and OS are you using? Did this work in previous versions?**
+
+Please provide the output of `circleci version` and `circleci diagnostic`.
+
+**If you have any questions, feel free to ping us at @CircleCI-Public/dx-clients.**
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 000000000..110777f42
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,15 @@
+- [ ] I have our [Contribution Guidelines](./CONTRIBUTING.md).
+- [ ] I checked for similar issues and didn't find anything relevant.
+- [ ] This is not a security issue (which should be reported here: https://circleci.com/security/)
+
+**Here are some helpful tips you can follow when submitting a pull request:**
+
+1. Fork [the repository](https://github.com/CircleCI-Public/circleci-cli) and create your branch from `master`.
+2. Run `make build` in the repository root.
+3. If you've fixed a bug or added code that should be tested, add tests!
+4. Ensure the test suite passes (`make test`).
+5. The `--debug` flag is often helpful for debugging HTTP client requests and responses.
+6. Format your code with [gofmt](https://golang.org/cmd/gofmt/).
+7. Make sure your code lints (`make lint`). Tip: `make dev` will install `gometalinter`.
+
+**If you have any questions, feel free to ping us at @CircleCI-Public/dx-clients.**