diff --git a/.github/DISCUSSION_TEMPLATE/bug.yml b/.github/DISCUSSION_TEMPLATE/bug.yml
new file mode 100644
index 000000000..bfc9532f7
--- /dev/null
+++ b/.github/DISCUSSION_TEMPLATE/bug.yml
@@ -0,0 +1,121 @@
+body:
+    - type: markdown
+      attributes:
+          value: |
+              Hi there! 👋
+              
+              Thank you for using Livewire PowerGrid!
+              
+              Many of the people who help resolve issues here are enthusiastic PowerGrid users like yourself who volunteer their time to support fellow community members.
+            
+              To respect everyone's valuable time and help you resolve your issue as quickly as possible, before posting an issue, please
+            
+              Update to the latest version of PowerGrid by running `composer update power-components/livewire-powergrid`
+              Before opening a bug report, please search the existing discussions.
+              
+              To address this bug as fast as possible, we need the following information.
+    - type: input
+      id: powergrid-version
+      attributes:
+          label: Livewire PowerGrid version
+          description: Which version of PowerGrid are you using? Please provide the full version, e.g. v6.1.0.
+          placeholder: v6.1.0
+      validations:
+          required: true
+
+    - type: input
+      id: livewire-version
+      attributes:
+          label: Livewire version
+          description: Which version of Livewire are you using? Please provide the full version, e.g. v3.5.16.
+          placeholder: v3.5.16
+      validations:
+          required: true
+
+    - type: input
+      id: laravel-version
+      attributes:
+          label: Laravel version
+          description: Which version of Laravel are you using? Please provide the full version, e.g. v11.34.2.
+          placeholder: v11.34.2
+      validations:
+          required: true
+
+    - type: dropdown
+      id: php-version
+      attributes:
+          label: Which PHP version are you using?
+          options:
+              - PHP 8.4
+              - PHP 8.3
+              - PHP 8.2
+              - PHP 8.1
+
+    -   type: dropdown
+        id: php-version
+        attributes:
+          label: Which Theme are you using?
+          options:
+              - Tailwind
+              - Bootstrap 5
+
+    - type: dropdown
+      id: published-assets
+      attributes:
+         label: Have you published the resource files and customized them? (php artisan vendor:publish)
+         options:
+            - Yes
+            - No
+
+      validations:
+          required: true
+
+    - type: textarea
+      attributes:
+          label: What is the problem?
+          description: Please provide a clear and concise description of what the problem is and include screenshots.
+      validations:
+          required: true
+
+    - type: textarea
+      attributes:
+          label: Code snippets
+          description: Please include a code snippet that we can copy and paste into our apps with steps to reproduce. Alternatively, create a public example repository and paste it here.
+      validations:
+          required: true
+
+    - type: markdown
+      attributes:
+          value: |
+              Include code snippets in triple backticks (\```) with "blade" or "php" for better readability. Here's an example:
+
+    - type: textarea
+      attributes:
+          label: How do you expect it to work?
+          description: Please describe how you expect it to work.
+      validations:
+          required: true
+
+    - type: markdown
+      attributes:
+          value: |
+              **We will close this issue for any of the following reasons**
+              
+              * The code snippets contain unrelated code such as left-over Blade variables
+              * We cannot reproduce the issue with the provided code snippets
+              * The issue is a duplicate
+
+    - type: checkboxes
+      attributes:
+          label: Please confirm (incomplete submissions will not be addressed)
+          options:
+              - label: I have provided easy and step-by-step instructions to reproduce the bug.
+                required: true
+              - label: I have provided code samples as text and NOT images.
+                required: true
+              - label: I understand my bug report will be removed if I haven't met the criteria above.
+                required: true
+
+    - type: markdown
+      attributes:
+          value: Thank you!
diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
deleted file mode 100644
index b8ab49937..000000000
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ /dev/null
@@ -1,89 +0,0 @@
-<!-- ===================================================================================================== -->
-<!-- ====== YOU *MUST* READ THE GUIDELINES & USE THIS TEMPLATE OR YOUR ISSUE WILL BE CLOSED ============== -->
-<!-- ===================================================================================================== -->
-
-# ⚡ PowerGrid ⚡ Bug Report
-
-<table><tr><td>❗ You <b>MUST</b> use this template to submit an issue or it will be CLOSED. ❗</td></tr></table><br/>
-
-Thank you for reporting a bug and helping us to improve our software!
-
-## Guidelines
-
-`   🐛 `   We use GitHub Issues **EXCLUSIVELY** for tracking bugs and unexpected software behavior.
-
-`   🙏 `  Questions like _"How to...",_ "_how can I..."_, _"I would like to..."_ should be posted in the [Discussions](https://github.com/Power-Components/livewire-powergrid/discussions) tab.
-
-`   ✍️ `  Give this report a short but meaningful title. Make it easy to spot for others who might be facing the same issue.
-
-`   ⚠️ `  Issues that do not describe a bug will be closed.
-
-## Information
-
-### Pre-steps
-
-#### Have you searched through other issues to see if your problem is already reported or has been fixed?
-- [ ] Yes - I did not find it.
-- [ ] No
-
-#### Did you read the [documentation](https://livewire-powergrid.com/)?
-- [ ] Yes - I did not find it.
-- [ ] No
-
-#### Have you tried to publish the views?
-
-You can publish the views to make sure there is no "old code" trapped in views which are not up-to-date.
-
-To publish, run: `php artisan vendor:publish --tag=livewire-powergrid-views`
-
-- [ ] Yes - I didn't work.
-- [ ] No, this error is not related to views.
-
-#### Is there an error in the console?
-- [ ] Yes - I'll add a screenshot or report it below.
-- [ ] No
-
-### Software Version
-
-You can run `composer show -i` and `npm list` to list installed package with their versions.
-
-| Software  | Version (exactly) |
-|-----------|-------------------|
-| PowerGrid |                   |
-| Laravel   |                   |
-| Livewire  |                   |
-| Alpine JS  |                   |
-
-### Theme
-- [ ] Tailwind 2.x
-- [ ] Tailwind 3.x
-  - [ ] With tailwind/forms
-- [ ] Bootstrap - Version:        
-
----
-## Describe the bug
-
-### What happened?
-
-I did FOO expecting BAR as a result. However, I received BAZ...
-
-### To Reproduce...
-
-First click on "FOO" then....
-
-### Suggestions
-
-(Do you have any idea how we can fix it?)
-
-
-## Extra information
-
-**Screenshots**
-
-**Code snippet**
-
-```php 
-<?php
-
-//...
-```
diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
deleted file mode 100644
index 037a59bc7..000000000
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ /dev/null
@@ -1,136 +0,0 @@
-name: Bug Report
-description: File a bug report
-title: "Title"
-body:
-  - type: markdown
-    attributes:
-      value: "## ⚡ PowerGrid ⚡ Bug Report"
-  - type: markdown
-    attributes:
-      value: "Thank you for reporting a bug and helping us to improve our software!"
-  - type: markdown
-    attributes:
-      value: "## Guidelines"
-  - type: markdown
-    attributes:
-      value: "`   🐛 `   We use GitHub Issues **EXCLUSIVELY** for tracking bugs and unexpected software behavior."
-  - type: markdown
-    attributes:
-      value: "`   🙏 `  Questions like _\"How to...\",_ \"_how can I...\"_, _\"I would like to...\"_ should be posted in the [Discussions](https://github.com/Power-Components/livewire-powergrid/discussions) tab."
-  - type: markdown
-    attributes:
-      value: "`   ✍️ `  Give this report a short but meaningful title. Make it easy to spot for others who might be facing the same issue."
-  - type: markdown
-    attributes:
-      value: "`   ⚠️ `  Issues that do not describe a bug will be closed."
-  - type: markdown
-    attributes:
-      value: "## Information"
-  - type: markdown
-    attributes:
-      value: "### Pre-steps"
-  - type: dropdown
-    attributes:
-      label: "Have you searched through other issues to see if your problem is already reported or has been fixed?"
-      options:
-        - Yes, I did not find it.
-        - "No"
-    validations:
-      required: true
-  - type: markdown
-    attributes:
-      value: "[documentation](https://livewire-powergrid.com/)"
-  - type: dropdown
-    attributes:
-      label: "Did you read the documentation?"
-      options:
-        - Yes, I did not find it.
-        - "No"
-    validations:
-      required: true
-  - type: markdown
-    attributes:
-      value: "#### Have you tried to publish the views?"
-  - type: markdown
-    attributes:
-      value: "You can publish the views to make sure there is no \"old code\" trapped in views which are not up-to-date."
-  - type: markdown
-    attributes:
-      value: "To publish, run: `php artisan vendor:publish --tag=livewire-powergrid-views`"
-  - type: dropdown
-    attributes:
-      label: "Have you tried to publish the views?"
-      options:
-        - Yes - I didn't work.
-        - No, this error is not related to views.
-    validations:
-      required: true
-  - type: textarea
-    id: error-console
-    attributes:
-      label: Is there an error in the console?
-      description: Yes - I'll add a screenshot or report it below.
-      placeholder: Yes - I'll add a screenshot or report it below.
-      value: "No"
-  - type: markdown
-    attributes:
-      value: "### Software Version"
-  - type: markdown
-    attributes:
-      value: "You can run `composer show -i` and `npm list` to list installed package with their versions."
-  - type: input
-    id: PHP
-    attributes:
-      label: PHP Version
-      placeholder: ex. 8.0.1
-  - type: input
-    id: PowerGrid
-    attributes:
-      label: PowerGrid
-      placeholder: ex. 4.4.1
-  - type: input
-    id: Laravel
-    attributes:
-      label: Laravel
-      placeholder: ex. 10.0.1
-  - type: input
-    id: Livewire
-    attributes:
-      label: Livewire
-      placeholder: ex. 3.0.1
-  - type: input
-    id: Alpine-JS
-    attributes:
-      label: Alpine JS
-      placeholder: ex. 3.0.1
-  - type: dropdown
-    attributes:
-      label: Theme
-      multiple: true
-      options:
-        - Tailwind 3.x
-        - Tailwind 3.x with tailwind/forms
-        - Bootstrap
-    validations:
-      required: true
-  - type: textarea
-    id: bug
-    attributes:
-      label: Describe the bug.
-      description: What happened?
-      placeholder: "I did FOO expecting BAR as a result. However, I received BAZ..."
-  - type: textarea
-    id: reproduce
-    attributes:
-      label: To Reproduce...
-      value: "First click on \"FOO\" then...."
-  - type: textarea
-    id: extra-information
-    attributes:
-      label: Extra information
-      placeholder: Screenshots and code snippet
-      value: "```php \n
-          <?php\n
-            //...\n
-      ```"
-      render: markdown
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index ba91ddde1..d8d84f8da 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1,8 @@
 blank_issues_enabled: false
 contact_links:
+  - name: Bug Report
+    url: https://github.com/Power-Components/livewire-powergrid/discussions/new?category=bug
+    about: Submit a bug or an issue
   - name: Ask a question
     url: https://github.com/Power-Components/livewire-powergrid/discussions/new?category=q-a
     about: Ask the community for help
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 4fe6767a4..000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,26 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: ''
-assignees: ''
-
----
-
-# ⚡ PowerGrid ⚡ Feature Request
-
-## Summary
-
-Brief description of what is at stake.
-
-### Why is this needed?
-
-A clear and concise description of the problem.
-
-### Suggested Solution(s)
-
-A clear and concise description of what you want to happen.
-
-### Related issue(s)/PR(s)
-
-Let us know if this is related to any issue/request
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 477bed9fd..f62b5b89f 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,27 +1,20 @@
-<!-- Please read the guidelines and use the template below. Thanks. -->
-
 ## ⚡ PowerGrid - Pull Request
 
-Welcome and thank you for your interest in contributing to our project!. You must use this template to submit a Pull Request or it will not be accepted.
-
---- 
-#### Motivation
-
-- [ ] Bug fix
+- [x] Bug fix
 - [ ] Enhancement
 - [ ] New feature
 - [ ] Breaking change
 
 #### Description
 
-This Pull Request adds...
+...
 
-#### Related Issue(s):  #_____.
+#### Related Issue(s): 
 
 #### Documentation
 
  This PR requires [Documentation](https://github.com/Power-Components/powergrid-doc) update?
 
 - [ ] Yes
-- [ ] No
+- [x] No
 - [ ] I have already submitted a Documentation pull request.
diff --git a/.github/workflows/code-style.yml b/.github/workflows/code-style.yml
index b992c6442..b4939823f 100644
--- a/.github/workflows/code-style.yml
+++ b/.github/workflows/code-style.yml
@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ 8.2 ]
+        php: [ 8.3 ]
         laravel: [ 11.* ]
         exclude:
           - php: 8.1
diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml
index 512394a80..b3a4de0b7 100644
--- a/.github/workflows/cypress.yml
+++ b/.github/workflows/cypress.yml
@@ -6,12 +6,20 @@ on:
       - "**"
     paths-ignore:
       - "art/**"
+      - ".github/DISCUSSION_TEMPLATE/**"
+      - ".github/ISSUE_TEMPLATE/**"
+      - ".github/PULL_REQUEST_TEMPLATE.md"
       - "README.md"
+      - "CONTRIBUTING.md"
   pull_request:
     types: [ready_for_review, synchronize, opened]
     paths-ignore:
       - "art/**"
+      - ".github/DISCUSSION_TEMPLATE/**"
+      - ".github/ISSUE_TEMPLATE/**"
+      - ".github/PULL_REQUEST_TEMPLATE.md"
       - "README.md"
+      - "CONTRIBUTING.md"
 
 jobs:
   build:
diff --git a/.github/workflows/mysql.yml b/.github/workflows/mysql.yml
index 93f0f11a4..0ee098ba2 100644
--- a/.github/workflows/mysql.yml
+++ b/.github/workflows/mysql.yml
@@ -6,12 +6,20 @@ on:
       - "**"
     paths-ignore:
       - "art/**"
+      - ".github/DISCUSSION_TEMPLATE/**"
+      - ".github/ISSUE_TEMPLATE/**"
+      - ".github/PULL_REQUEST_TEMPLATE.md"
       - "README.md"
+      - "CONTRIBUTING.md"
   pull_request:
     types: [ready_for_review, synchronize, opened]
     paths-ignore:
       - "art/**"
+      - ".github/DISCUSSION_TEMPLATE/**"
+      - ".github/ISSUE_TEMPLATE/**"
+      - ".github/PULL_REQUEST_TEMPLATE.md"
       - "README.md"
+      - "CONTRIBUTING.md"
 
 jobs:
   build:
diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
index 15c1371b8..f74bc013d 100644
--- a/.github/workflows/phpstan.yml
+++ b/.github/workflows/phpstan.yml
@@ -6,12 +6,20 @@ on:
       - "**"
     paths-ignore:
       - "art/**"
+      - ".github/DISCUSSION_TEMPLATE/**"
+      - ".github/ISSUE_TEMPLATE/**"
+      - ".github/PULL_REQUEST_TEMPLATE.md"
       - "README.md"
+      - "CONTRIBUTING.md"
   pull_request:
     types: [ready_for_review, synchronize, opened]
     paths-ignore:
       - "art/**"
+      - ".github/DISCUSSION_TEMPLATE/**"
+      - ".github/ISSUE_TEMPLATE/**"
+      - ".github/PULL_REQUEST_TEMPLATE.md"
       - "README.md"
+      - "CONTRIBUTING.md"
 
 jobs:
   build:
diff --git a/.github/workflows/postgres.yml b/.github/workflows/postgres.yml
index a5d33f2ea..255220238 100644
--- a/.github/workflows/postgres.yml
+++ b/.github/workflows/postgres.yml
@@ -6,12 +6,20 @@ on:
       - "**"
     paths-ignore:
       - "art/**"
+      - ".github/DISCUSSION_TEMPLATE/**"
+      - ".github/ISSUE_TEMPLATE/**"
+      - ".github/PULL_REQUEST_TEMPLATE.md"
       - "README.md"
+      - "CONTRIBUTING.md"
   pull_request:
     types: [ready_for_review, synchronize, opened]
     paths-ignore:
       - "art/**"
+      - ".github/DISCUSSION_TEMPLATE/**"
+      - ".github/ISSUE_TEMPLATE/**"
+      - ".github/PULL_REQUEST_TEMPLATE.md"
       - "README.md"
+      - "CONTRIBUTING.md"
 
 jobs:
   build:
diff --git a/.github/workflows/sqlite.yml b/.github/workflows/sqlite.yml
index e60f008dd..160e63a66 100644
--- a/.github/workflows/sqlite.yml
+++ b/.github/workflows/sqlite.yml
@@ -6,12 +6,20 @@ on:
       - "**"
     paths-ignore:
       - "art/**"
+      - ".github/DISCUSSION_TEMPLATE/**"
+      - ".github/ISSUE_TEMPLATE/**"
+      - ".github/PULL_REQUEST_TEMPLATE.md"
       - "README.md"
+      - "CONTRIBUTING.md"
   pull_request:
     types: [ready_for_review, synchronize, opened]
     paths-ignore:
       - "art/**"
+      - ".github/DISCUSSION_TEMPLATE/**"
+      - ".github/ISSUE_TEMPLATE/**"
+      - ".github/PULL_REQUEST_TEMPLATE.md"
       - "README.md"
+      - "CONTRIBUTING.md"
 
 jobs:
   build:
@@ -21,12 +29,7 @@ jobs:
       matrix:
         php: [8.3, 8.2 ]
         laravel: [ 11.* ]
-        exclude:
-          - php: 8.1
-            laravel: 11.*
         include:
-          - laravel: 10.*
-            testbench: 8.*
           - laravel: 11.*
             testbench: 9.*
         dependency-version: [ prefer-stable ]