diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 00000000..0616e5f0
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,21 @@
+---
+name: Bug report
+about: Report a bug in Dapr CLI
+title: ''
+labels: kind/bug
+assignees: ''
+
+---
+## Expected Behavior
+
+<!-- Briefly describe what you expect to happen -->
+
+
+## Actual Behavior
+
+<!-- Briefly describe what is actually happening -->
+
+
+## Steps to Reproduce the Problem
+
+<!-- How can a maintainer reproduce this issue (be detailed) -->
diff --git a/.github/ISSUE_TEMPLATE/discussion.md b/.github/ISSUE_TEMPLATE/discussion.md
new file mode 100644
index 00000000..0a9bcd6b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/discussion.md
@@ -0,0 +1,8 @@
+---
+name: Feature Request
+about: Start a discussion for Dapr CLI
+title: ''
+labels: kind/discussion
+assignees: ''
+
+---
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 00000000..3ae25ccb
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,9 @@
+---
+name: Feature Request
+about: Create a Feature Request for Dapr CLI
+title: ''
+labels: kind/enhancement
+assignees: ''
+
+---
+## Describe the feature
diff --git a/.github/ISSUE_TEMPLATE/proposal.md b/.github/ISSUE_TEMPLATE/proposal.md
new file mode 100644
index 00000000..3d6cb17e
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/proposal.md
@@ -0,0 +1,9 @@
+---
+name: Proposal
+about: Create a proposal for Dapr CLI
+title: ''
+labels: kind/proposal
+assignees: ''
+
+---
+## Describe the proposal
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
new file mode 100644
index 00000000..3cf84f85
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -0,0 +1,9 @@
+---
+name: Question
+about: Ask a question about Dapr CLI
+title: ''
+labels: kind/question
+assignees: ''
+
+---
+## Ask your question here
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 00000000..f91a3731
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,17 @@
+# Description
+
+_Please explain the changes you've made_
+
+## Issue reference
+
+We strive to have all PR being opened based on an issue, where the problem or feature have been discussed prior to implementation.
+
+Please reference the issue this PR will close: #_[issue number]_
+
+## Checklist
+
+Please make sure you've completed the relevant tasks for this PR, out of the following list:
+
+* [ ] Code compiles correctly
+* [ ] Created/updated tests
+* [ ] Extended the documentation