diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 5baecca..79a70b8 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1 @@
-*   @rswrz @lixhunter @Phil-Thoennissen
+*   @rswrz @lixhunter @Phil-Thoennissen @neonwhiskers
diff --git a/.github/ISSUE_TEMPLATE/bug-template.yml b/.github/ISSUE_TEMPLATE/bug-template.yml
index 98792c1..16554d6 100644
--- a/.github/ISSUE_TEMPLATE/bug-template.yml
+++ b/.github/ISSUE_TEMPLATE/bug-template.yml
@@ -55,4 +55,4 @@ body:
       description: "By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/cloudeteer/terraform-governance?tab=coc-ov-file#code-of-conduct)."
       options:
         - label: I agree to follow this repository's Code of Conduct
-          required: truee
+          required: true
diff --git a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md
new file mode 100644
index 0000000..3be40a6
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md
@@ -0,0 +1,16 @@
+## Description
+<!--- Describe your changes in detail -->
+
+## PR Checklist
+- [ ] I have checked if my changes close any open issues. If so please include appropriate [closing keywords](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword) below.
+- [ ] I have updated/added documentation written in a helpful and kind way to assist users that may be unfamiliar with the resource / data source.
+- [ ] I have checked for a proper tag for this PR: `breaking-change`, `feature`, `fix`, `other`, `ignore-release`
+- [ ] I have used a **meaningful** PR title to help maintainers and other users understand this change and help prevent duplicate work.
+
+## Motivation and Context
+<!--- Why is this change required? What problem does it solve? -->
+<!--- If it fixes an open issue, please link to the issue here. -->
+
+## Breaking Changes
+<!-- Does this break backwards compatibility with the current major version? -->
+<!-- If so, please provide an explanation why it is necessary. -->
diff --git a/.github/workflows/module-ci.yaml b/.github/workflows/module-ci.yaml
index ec15a50..7b2e625 100644
--- a/.github/workflows/module-ci.yaml
+++ b/.github/workflows/module-ci.yaml
@@ -1,26 +1,22 @@
 name: module-ci
 on:
+  workflow_dispatch:
   schedule:
     - cron: "0 0 * * 0" # weekly on Sunday at 00:00
-  push:
-    branches:
-      - main
   pull_request:
     types:
       - opened
       - edited
       - synchronize
-      - labeled
-      - unlabeled
+      - ready_for_review
 
 jobs:
   module-ci:
     uses: cloudeteer/terraform-governance/.github/workflows/module-ci.yaml@main
     permissions:
-      contents: write
-      id-token: write
+      contents: read
       issues: write
-      pull-requests: read
+      id-token: write
     secrets:
       ARM_CLIENT_ID: ${{ secrets.ARM_CLIENT_ID }}
       ARM_SUBSCRIPTION_ID: ${{ secrets.ARM_SUBSCRIPTION_ID }}
diff --git a/.github/workflows/module-manage-github.yaml b/.github/workflows/module-manage-github.yaml
new file mode 100644
index 0000000..97ab6c7
--- /dev/null
+++ b/.github/workflows/module-manage-github.yaml
@@ -0,0 +1,21 @@
+name: module-manage-github
+on:
+  push:
+    branches:
+      - main
+  issues:
+    types:
+      - opened
+  pull_request:
+    types:
+      - opened
+      - labeled
+      - unlabeled
+
+jobs:
+  module-manage-github:
+    uses: cloudeteer/terraform-governance/.github/workflows/module-github.yaml@main
+    permissions:
+      contents: write
+      pull-requests: read
+    secrets: inherit