diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index 0e7de05..0000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,40 +0,0 @@
-### Prerequisites
-
-Put an `x` into the box that applies:
-
-- [ ] This issue describes a bug.
-- [ ] This issue describes a feature request.
-
-For more information, see the [Contributing Guidelines](https://github.com/cloud-ca/cca/tree/master/CONTRIBUTING.md).
-
-### Description
-
-Briefly describe the issue.
-
-#### Actual Behavior
-
-Briefly describe what happened.
-
-```
-```
-
-Do you have long logs to share? Please go to https://ghostbin.com and insert the link here.
-
-#### Expected Behavior
-
-Briefly describe what you expected to happen.
-
-```
-```
-
-### Replication Case
-
-Tell us which steps to take to replicate your problem.
-
-1. ...
-2. ...
-3. ...
-
-### Version
-
-You can get this information via `cca --version`.
diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
new file mode 100644
index 0000000..109a05e
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -0,0 +1,37 @@
+---
+name: Bug Report
+about: Report a bug encountered while working with cca CLI
+labels: bug
+---
+### Description
+
+Describe the issue.
+
+#### Actual Behavior
+
+Describe what happened.
+
+```
+```
+
+Do you have long logs to share? Please go to https://ghostbin.com and insert the link here.
+
+#### Expected Behavior
+
+Describe what you expected to happen.
+
+```
+```
+
+### Replication Case
+
+Tell us which steps to take to replicate your problem.
+
+1. ...
+2. ...
+3. ...
+
+### Environment
+
+- Version (use `cca version`):
+- OS (e.g: `cat /etc/os-release`):
diff --git a/.github/ISSUE_TEMPLATE/enhancement.md b/.github/ISSUE_TEMPLATE/enhancement.md
new file mode 100644
index 0000000..4ea0d73
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/enhancement.md
@@ -0,0 +1,16 @@
+---
+name: Enhancement Request
+about: Suggest an enhancement to the cca CLI
+labels: enhancement
+---
+### What would you like to be added
+
+1. ...
+2. ...
+3. ...
+
+### Why is this needed
+
+1. ...
+2. ...
+3. ...
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 8c5763b..e177579 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -7,11 +7,9 @@ Put an `x` into the box(es) that apply:
 - [ ] This pull request enhances existing functionality.
 - [ ] This pull request introduces breaking change.
 
-For more information, see the [Contributing Guide](https://github.com/cloud-ca/cca/tree/master/CONTRIBUTING.md).
-
 ### Description
 
-Describe what this pull request achieves. Ensure you have read the [Contributing Guidelines](https://github.com/cloud-ca/cca/tree/master/CONTRIBUTING.md) document before submitting.
+Describe what this pull request achieves.
 
 ### Issues Resolved
 
@@ -21,8 +19,6 @@ List any existing issues this pull request resolves.
 
 Put an `x` into all boxes that apply:
 
-- [ ] I have read the [Contributing Guidelines](https://github.com/cloud-ca/cca/tree/master/CONTRIBUTING.md).
-
 #### Tests
 
 - [ ] I have added tests to cover my changes.