diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index b93930e..ce1b956 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -86,3 +86,7 @@ Include a [minimum complete verifiable example] with:
 
 ---
 
+## Code of Conduct
+*Read the Ansible Code of Conduct first.*
+
+- [ ] I agree to follow the [Ansible Community Code of Conduct](https://docs.ansible.com/ansible/latest/community/code_of_conduct.html)
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 440e716..ab68a73 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -49,3 +49,8 @@ assignees: ''
 *Add any other context or screenshots about the feature request here.*
 
 ---
+
+## Code of Conduct
+*Read the Ansible Code of Conduct first.*
+
+- [ ] I agree to follow the [Ansible Community Code of Conduct](https://docs.ansible.com/ansible/latest/community/code_of_conduct.html)
diff --git a/.github/PULL_REQUEST_TEMPLATE/docs_pull_request_template.md b/.github/PULL_REQUEST_TEMPLATE/docs_pull_request_template.md
deleted file mode 100644
index e9a2a9a..0000000
--- a/.github/PULL_REQUEST_TEMPLATE/docs_pull_request_template.md
+++ /dev/null
@@ -1,7 +0,0 @@
-## Summary
-
-<!-- Use prefix such as NEW, CHG. FIX for the commits -->
-
-## Connected GitHub issues
-
-* https://github.com/redhat-cop/rhis-code/issues/xxx