diff --git a/.github/ISSUE_TEMPLATE/bug-report.yaml b/.github/ISSUE_TEMPLATE/bug-report.yaml
new file mode 100644
index 0000000..fc50801
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.yaml
@@ -0,0 +1,42 @@
+name: Bug Report
+description: Create a bug report for this plugin.
+labels:
+  - bug
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to submit a bug report! To ensure this hasn’t already been reported, please first search existing issues.
+
+        To rule out that this isn’t a setup or configuration issue, please read the docs.
+        
+        If you still believe you’ve found a bug, please provide a clear and concise description, including:
+        - What is happening and what you expected to happen.
+        - Steps to reproduce the issue.
+        - Screenshots, if applicable.
+  - type: textarea
+    id: body
+    attributes:
+      label: Bug Report
+      description: Please provide a clear and concise description of the bug.
+    validations:
+      required: true
+  - type: input
+    id: pluginVersion
+    attributes:
+      label: Plugin Version
+      description: Provide the plugin version that this relates to, ideally the latest version.
+    validations:
+      required: true
+  - type: input
+    id: craftVersion
+    attributes:
+      label: Craft CMS Version
+      description: Provide the version of Craft that is installed.
+    validations:
+      required: true
+  - type: input
+    id: phpVersion
+    attributes:
+      label: PHP Version
+      description: Provide the PHP version, if applicable.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 2a45da2..0000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-name: Bug report
-about: Create a bug report for this plugin.
-title: ''
-labels: bug
-assignees: ''
-
----
-
-Please provide a clear and concise description of what the bug is, including:
-- Steps to reproduce the issue.
-- A clear and concise description of what you expected to happen.
-- If applicable, add screenshots to help explain your problem.
-- The plugin and Craft version numbers.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000..3ba13e0
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1 @@
+blank_issues_enabled: false
diff --git a/.github/ISSUE_TEMPLATE/feature-request.yaml b/.github/ISSUE_TEMPLATE/feature-request.yaml
new file mode 100644
index 0000000..12c2c68
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.yaml
@@ -0,0 +1,25 @@
+name: Feature Request
+description: Suggest a new feature for this plugin.
+labels:
+  - enhancement
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to submit a feature request! To ensure this isn’t already on our radar, please first search existing issues.
+
+        If you still believe you have a new suggestion, please provide a clear and concise description, including:
+        - What problem you believe your feature request can solve.
+        - Any alternative solutions or features you have already considered.
+  - type: textarea
+    id: body
+    attributes:
+      label: Feature Request
+      description: Please provide a clear and concise suggestion for a feature.
+    validations:
+      required: true
+  - type: input
+    id: pluginVersion
+    attributes:
+      label: Plugin Version
+      description: Provide the plugin version that this relates to, ideally the latest version.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index bd44c9d..0000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-name: Feature request
-about: Suggest a feature for this plugin.
-title: ''
-labels: enhancement
-assignees: ''
-
----
-
-Please provide a clear and concise description of your feature request, including:
-- What the problem is and what you would like to have happen.
-- Any alternative solutions or features you have considered.
diff --git a/.github/ISSUE_TEMPLATE/support-request.md b/.github/ISSUE_TEMPLATE/support-request.md
deleted file mode 100644
index 5a675ed..0000000
--- a/.github/ISSUE_TEMPLATE/support-request.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-name: Support request
-about: Ask a question about this plugin.
-title: ''
-labels: question
-assignees: ''
-
----
-
-Please provide a clear and concise question. We are diligent about documentation, so please check whether your question is answered by the plugin docs before submitting.
diff --git a/.github/ISSUE_TEMPLATE/support-request.yaml b/.github/ISSUE_TEMPLATE/support-request.yaml
new file mode 100644
index 0000000..688f303
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/support-request.yaml
@@ -0,0 +1,23 @@
+name: Support Request
+description: Ask a question about this plugin.
+labels:
+  - question
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to submit a support request! To ensure your question hasn’t already been asked and answered, please first search existing issues.
+        
+        If your question is still unanswered, please provide a clear and concise description. Note that we are diligent about documentation, so please check whether your question is answered by the plugin docs before submitting.
+  - type: textarea
+    id: body
+    attributes:
+      label: Support Request
+      description: Please provide a clear and concise question.
+    validations:
+      required: true
+  - type: input
+    id: pluginVersion
+    attributes:
+      label: Plugin Version
+      description: Provide the plugin version that this relates to, ideally the latest version.
diff --git a/.github/workflows/code-analysis.yaml b/.github/workflows/code-analysis.yaml
new file mode 100644
index 0000000..d4bf3fa
--- /dev/null
+++ b/.github/workflows/code-analysis.yaml
@@ -0,0 +1,40 @@
+name: Code Analysis
+
+on:
+  pull_request: null
+  push:
+    branches:
+      - develop
+  workflow_dispatch:
+permissions:
+  contents: read
+jobs:
+  code_analysis:
+    strategy:
+      fail-fast: false
+      matrix:
+        actions:
+          - name: 'PHPStan'
+            run: composer phpstan
+          - name: 'Coding Standards'
+            run: composer fix-cs
+    name: ${{ matrix.actions.name }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Cache Composer dependencies
+        uses: actions/cache@v4
+        with:
+          path: /tmp/composer-cache
+          key: ${{ runner.os }}-${{ hashFiles('**/composer.lock') }}
+      - name: Setup PHP
+        id: setup-php
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.2
+          extensions: 'ctype,curl,dom,iconv,imagick,intl,json,mbstring,openssl,pcre,pdo,reflection,spl,zip'
+          ini-values: post_max_size=256M, max_execution_time=180, memory_limit=512M
+          tools: composer:v2
+      - name: Install Composer dependencies
+        run: composer install --no-interaction --no-ansi --no-progress
+      - run: ${{ matrix.actions.run }}