diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index a06e829..c448410 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -26,7 +26,7 @@ assignees: ""
 ## Screenshots/Logs
 <!-- If applicable, please attach any screenshots, logs, or error messages that may help in reproducing the issue. -->
 
-## Impacted Application/Tools/Utility Version:
+## Impacted Application/Tools/Utility Version
 
 <!-- 
 - Version: [e.g. v1.0.0]
@@ -35,7 +35,7 @@ assignees: ""
 - gradle etc
 -->
 
-## Environment:
+## Environment
 <!-- 
 - OS: [e.g. Ubuntu 20.04]
 - Java Version: [e.g. OpenJDK 11] 
diff --git a/.github/ISSUE_TEMPLATE/document_improvement.md b/.github/ISSUE_TEMPLATE/document_improvement.md
index 62b60c0..6a293e8 100644
--- a/.github/ISSUE_TEMPLATE/document_improvement.md
+++ b/.github/ISSUE_TEMPLATE/document_improvement.md
@@ -14,6 +14,7 @@ assignees: ""
 <!-- Provide the suggested changes or additions to the documentation, including code snippets if applicable. -->
 
 ## Affected Documentation
+
 - [ ] README.md
 - [ ] API Documentation
 - [ ] Developer Guide
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 41b5516..e9cbd7b 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -22,7 +22,7 @@ This can be anything from CI tool integration, Security feature (use Security-De
 ## Benefits
 <!-- Describe the benefits of this feature and why it should be prioritized. -->
 
-### Example:
+### Example
 <!-- - Provide examples of how the feature will work or how it will be used, if possible. -->
 
 ## Additional Information
diff --git a/.github/ISSUE_TEMPLATE/security_vulnerability_report.md b/.github/ISSUE_TEMPLATE/security_vulnerability_report.md
index 0dd29d0..a2d522a 100644
--- a/.github/ISSUE_TEMPLATE/security_vulnerability_report.md
+++ b/.github/ISSUE_TEMPLATE/security_vulnerability_report.md
@@ -23,7 +23,7 @@ assignees: ""
 ## Suggested Mitigation or Fix
 <!-- If known, provide any suggestions for mitigating the vulnerability or fixing the issue. -->
 
-### CVSS Score (Optional):
+### CVSS Score (Optional)
 <!-- If you are aware of the Common Vulnerability Scoring System (CVSS) score, please include it to help assess the severity. -->
 
 ## Additional Information
diff --git a/.github/PULL_REQUEST_TEMPLATE/bug_pr_template.md b/.github/PULL_REQUEST_TEMPLATE/bug_pr_template.md
new file mode 100644
index 0000000..446f20d
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE/bug_pr_template.md
@@ -0,0 +1,51 @@
+## Description
+
+<!-- 
+Please provide a summary of the bug being fixed, the motivation for fixing it, and any context regarding how it impacts the functionality or users. 
+Please specify if this PR has dependency on any other changes.
+-->
+
+### Type of bug fix
+
+Link to GitHub Issue:
+
+Please select or add the type of bug fixed.
+
+- [ ] App Code (non-breaking change which fixes an issue)
+- [ ] CI/CD pipeline (please specify impacted component)
+- [ ] Configuration (please specify impacted component)
+
+## How has this been tested?
+
+<!--
+Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce the bug, and describe the expected behavior after the fix.
+
+- Test case 1 (please describe)
+- Test case 2 (please describe)
+
+Please attach relevant evidences supporting the test execution.
+-->
+
+## Checklist for Author
+
+- [ ] The PR follows below contribution conventions
+  - [ ] PR title follows [conventional commits](https://docs.cocogitto.io/guide/commit.html) format commit_type(
+      scope): issue_reference message
+  - [ ] PR commits follows [conventional commits](https://docs.cocogitto.io/guide/commit.html) format commit_type(
+      scope): issue_reference message
+  - [ ] PR branch follows convention of format [commit_type]-[issue-reference]-[brief-description]
+- [ ] I have tested the bug fix thoroughly and attached test evidences confirming changes works as expected
+- [ ] I have updated the documentation to reflect bug fixes (if applicable)
+- [ ] My changes generate no new warnings or errors
+- [ ] Checks for unused files
+- [ ] Checks for changes not related to this issue
+
+## Additional notes for reviewer
+
+<!-- Add any information that can be useful to the reviewer -->
+
+## Checklist for Reviewer
+
+- [ ] The PR follows contribution guidelines
+- [ ] I have reviewed the author checklist
+- [ ] I have tested the changes locally are working as expected
diff --git a/.github/PULL_REQUEST_TEMPLATE/document_pr_template.md b/.github/PULL_REQUEST_TEMPLATE/document_pr_template.md
new file mode 100644
index 0000000..72222e8
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE/document_pr_template.md
@@ -0,0 +1,57 @@
+## Description
+
+<!-- 
+Please include a summary of the changes made to the documentation. Explain the motivation for the change and the impact on the users or developers who rely on this documentation. 
+Please specify if this PR has dependency on any other changes.
+-->
+
+### Affected Documentation
+
+Link to GitHub Issue:
+
+Affected Documentation:
+
+- [ ] README
+- [ ] Setup Instructions
+- [ ] API Documentation
+- [ ] Developer Guide
+- [ ] Contribution Guide
+- [ ] Other (please specify):
+
+## How Has This Been Tested?
+
+Please describe how the changes to documentation were reviewed. If applicable, include instructions on how to view or
+test the updated documentation.
+
+- [ ] Documentation preview checked in markdown renderer
+- [ ] Links and images tested for correctness
+
+<!-- 
+Test Configuration:
+- Viewing tool: (e.g., GitHub Preview, Markdown renderer)
+- Platform: (e.g., browser, OS)
+-->
+
+## Checklist for Author
+
+- [ ] The PR follows below contribution conventions
+  - [ ] PR title follows [conventional commits](https://docs.cocogitto.io/guide/commit.html) format commit_type(
+      scope): issue_reference message
+  - [ ] PR commits follows [conventional commits](https://docs.cocogitto.io/guide/commit.html) format commit_type(
+      scope): issue_reference message
+  - [ ] PR branch follows convention of format [commit_type]-[issue-reference]-[brief-description]
+- [ ] My code follows the style guidelines of this project
+- [ ] I have performed a self-review of my documentation to reflect the code changes, spelling and is clearly accurate
+- [ ] I have tested the documentation for correctness and if required added evidences(e.g., links, images)
+- [ ] My changes generate no new warnings or errors
+- [ ] Checks for unused files
+- [ ] Checks for changes not related to this issue
+
+## Additional notes for reviewer
+
+<!-- Add any information that can be useful to the reviewer -->
+
+## Checklist for Reviewer
+
+- [ ] The PR follows contribution guidelines
+- [ ] Reviewed documentation for accuracy and rendering
diff --git a/.github/PULL_REQUEST_TEMPLATE/feature_pr_template.md b/.github/PULL_REQUEST_TEMPLATE/feature_pr_template.md
new file mode 100644
index 0000000..5bb419c
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE/feature_pr_template.md
@@ -0,0 +1,53 @@
+## Description
+
+<!-- 
+Please include a summary of the changes made to the documentation. Explain the motivation for the change and the impact on the users or developers who rely on this documentation. 
+Please specify if this PR has dependency on any other changes.
+-->
+
+### Type of feature request
+
+Link to GitHub Issue:
+
+Please add/delete options that are not relevant.
+
+- [ ] App code
+- [ ] Testing
+- [ ] CI/CD pipeline
+- [ ] DevSecOps
+- [ ] Configuration
+
+## How Has This Been Tested?
+
+<!--
+Please describe the tests that you ran to verify your changes.
+
+- Test case 1 (please describe)
+- Test case 2 (please describe)
+
+Please attach relevant evidences supporting the test execution.
+-->
+
+## Checklist for Author
+
+- [ ] The PR follows below contribution conventions
+  - [ ] PR title follows [conventional commits](https://docs.cocogitto.io/guide/commit.html) format commit_type(
+      scope): issue_reference message
+  - [ ] PR commits follows [conventional commits](https://docs.cocogitto.io/guide/commit.html) format commit_type(
+      scope): issue_reference message
+  - [ ] PR branch follows convention of format [commit_type]-[issue-reference]-[brief-description]
+- [ ] I have tested the enhancement thoroughly and attached test evidences confirming changes works as expected
+- [ ] I have updated the documentation to reflect enhancement (if applicable)
+- [ ] My changes generate no new warnings or errors and added tests that prove my feature PR is effective
+- [ ] Checks for unused files
+- [ ] Checks for changes not related to this issue
+
+## Additional notes for reviewer
+
+<!-- Add any information that can be useful to the reviewer -->
+
+## Checklist for Reviewer
+
+- [ ] The PR follows contribution guidelines
+- [ ] I have reviewed the author checklist
+- [ ] I have tested the changes locally are working as expected
diff --git a/.github/PULL_REQUEST_TEMPLATE/generic_pr_template.md b/.github/PULL_REQUEST_TEMPLATE/generic_pr_template.md
new file mode 100644
index 0000000..d4644ea
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE/generic_pr_template.md
@@ -0,0 +1,45 @@
+## Description
+
+<!-- 
+Please provide a summary of the changes made, the motivation for making the changes, and any context regarding how it impacts the functionality or users. 
+Please specify if this PR has dependency on any other changes.
+-->
+
+### Type of Change
+
+Link to GitHub Issue:
+
+## How has this been tested?
+
+<!--
+Please describe the tests that you ran to verify your changes.
+
+- Test case 1 (please describe)
+- Test case 2 (please describe)
+
+Please attach relevant evidences supporting the test execution.
+-->
+
+## Checklist for Author
+
+- [ ] The PR follows below contribution conventions
+  - [ ] PR title follows [conventional commits](https://docs.cocogitto.io/guide/commit.html) format commit_type(
+      scope): issue_reference message
+  - [ ] PR commits follows [conventional commits](https://docs.cocogitto.io/guide/commit.html) format commit_type(
+      scope): issue_reference message
+  - [ ] PR branch follows convention of format [commit_type]-[issue-reference]-[brief-description]
+- [ ] I have tested the changes thoroughly and attached test evidences confirming changes works as expected
+- [ ] I have updated the documentation to reflect changes (if applicable)
+- [ ] My changes generate no new warnings or errors
+- [ ] Checks for unused files
+- [ ] Checks for changes not related to this issue
+
+## Additional notes for reviewer
+
+<!-- Add any information that can be useful to the reviewer -->
+
+## Checklist for Reviewer
+
+- [ ] The PR follows contribution guidelines
+- [ ] I have reviewed the author checklist
+- [ ] I have tested the changes locally are working as expected
diff --git a/.github/PULL_REQUEST_TEMPLATE/security_vulnerability_pr_template.md b/.github/PULL_REQUEST_TEMPLATE/security_vulnerability_pr_template.md
new file mode 100644
index 0000000..406a013
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE/security_vulnerability_pr_template.md
@@ -0,0 +1,53 @@
+## Description
+
+<!-- 
+Please provide a summary of the security vulnerability being fixed, the motivation for fixing it, and any context regarding how it impacts the functionality or users. 
+Please specify if this PR has dependency on any other changes.
+-->
+
+### Type of Security Vulnerability
+
+Link to GitHub Issue:
+
+Please select or add the type of Security Vulnerability fixed.
+
+- [ ] App Code (non-breaking change which fixes an issue)
+- [ ] App Code Dependency
+- [ ] Container Image vulnerability
+- [ ] IAC vulnerability
+
+## How has this been tested?
+
+<!--
+Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce the bug, and describe the expected behavior after the fix.
+
+- Test case 1 (please describe)
+- Test case 2 (please describe)
+
+Please attach relevant evidences supporting the test execution.
+-->
+
+## Checklist for Author
+
+- [ ] The PR follows below contribution conventions
+  - [ ] PR title follows [conventional commits](https://docs.cocogitto.io/guide/commit.html) format commit_type(
+      scope): issue_reference message
+  - [ ] PR commits follows [conventional commits](https://docs.cocogitto.io/guide/commit.html) format commit_type(
+      scope): issue_reference message
+  - [ ] PR branch follows convention of format [commit_type]-[issue-reference]-[brief-description]
+- [ ] I have tested the security vulnerability thoroughly and attached test evidences confirming changes works as
+  expected
+- [ ] I have updated the documentation to reflect bug fixes (if applicable)
+- [ ] My changes generate no new warnings or errors
+- [ ] Checks for unused files
+- [ ] Checks for changes not related to this issue
+
+## Additional notes for reviewer
+
+<!-- Add any information that can be useful to the reviewer -->
+
+## Checklist for Reviewer
+
+- [ ] The PR follows contribution guidelines
+- [ ] I have reviewed the author checklist
+- [ ] I have tested the changes locally are working as expected
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 0000000..e4483cf
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,11 @@
+# Instructions
+
+Click the **Preview** tab and select a relevant PR template.
+
+Please use generic template for other types of changes.
+
+- [Feature](?expand=1&template=feature_pr_template.md)
+- [Bug](?expand=1&template=bug_pr_template.md)
+- [Document](?expand=1&template=document_pr_template.md)
+- [Security Vulnerability](?expand=1&template=security_vulnerability_pr_template.md)
+- [Generic](?expand=1&template=generic_pr_template.md)