diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
new file mode 100644
index 0000000..8b3326c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -0,0 +1,32 @@
+---
+name: Bug report
+about: Create a report to help us improve OPCT
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. Linux/amd64]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. v0.5.1]
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
new file mode 100644
index 0000000..bbcbbe7
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000..6a7b2b5
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,26 @@
+<!--
+- Please ensure code changes are split into a series of logically independent commits.
+- Every commit should have a subject/title (What) and a description/body (Why).
+- Every PR must have a description.
+- As an example you can use git commit -m"What" -m"Why" to achieve the requirements above.
+  GitHub automatically recognizes the commit description (-m"Why") in single commit PRs and
+  adds it as the PR description.
+- Use the [imperative mood](https://en.wikipedia.org/wiki/Imperative_mood) in the subject line
+  for every commit. E.g `Mark infraID as required` instead of `This patch marks infraID as required`
+  (This follows Git’s own built-in conventions). See https://github.com/openshift/hypershift/pull/485
+  as an example.
+- See https://github.com/redhat-openshift-ecosystem/opct/blob/main/CONTRIBUTING.md for more details.
+
+Delete this text before submitting the PR.
+-->
+
+**What this PR does / why we need it**:
+
+**Which issue(s) this PR fixes** *(optional, use `fixes #<issue_number>(, fixes #<issue_number>, ...)` format, where issue_number might be a GitHub issue, or a Jira story*:
+Fixes #
+
+**Checklist**
+- [ ] Subject and description added to both, commit and PR.
+- [ ] Relevant issues have been referenced.
+- [ ] This change includes docs. 
+- [ ] This change includes unit tests.