diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
new file mode 100644
index 00000000..d2836e65
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -0,0 +1,91 @@
+name: Bug Report
+description: Report a problem you are facing
+labels: ['bug']
+assignees: []
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for helping to improve openSenseMap! Please fill out the sections below. They help us to track down the issuer faster.
+
+  - type: checkboxes
+    id: checklist
+    attributes:
+      label: Before You Proceed
+      description: Please verify these items before submitting.
+      options:
+        - label: I have cleared my browsers cache and the issue still remains
+        - label: I have tried a different browser to see if it is related
+        - label: I have searched existing issues to avoid duplicates
+      required: false
+
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description:
+        Please give us a detailed description of the issue you are seeing.
+        Screenshots and videos help as well.
+      placeholder: |
+        What went wrong and where? Can you provide screenshots?
+    validations:
+      required: true
+
+  - type: textarea
+    id: expected-behavior
+    attributes:
+      label: Expected Behavior
+      description: What should have happened?
+      placeholder: |
+        Please describe the correct/desired outcome.
+    validations:
+      required: true
+
+  - type: textarea
+    id: steps-to-reproduce
+    attributes:
+      label: Steps to reproduce
+      description: Please provide a list of actions to trigger the bug.
+      placeholder: |
+        1. ...
+        2. ...
+    validations:
+      required: true
+
+  - type: textarea
+    id: environment
+    attributes:
+      label: Environment
+      description: OS, browser, version, and any relevant extensions or plugins.
+      placeholder: |
+        e.g., Windows 11, Chrome 119.0.6045.105, no extensions
+    validations:
+      required: true
+
+  - type: textarea
+    id: console-logs
+    attributes:
+      label: Console Output
+      description:
+        If you come across any error logs, e.g., in your browser console please
+        provide them here.
+      render: shell
+    validations:
+      required: false
+
+  - type: textarea
+    id: workaround
+    attributes:
+      label: Workaround
+      description: Did you find a workaround?
+    validations:
+      required: false
+
+  - type: textarea
+    id: additional-info
+    attributes:
+      label: Additional Information
+      description: Anything else that might help us investigate.
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/feature.yml b/.github/ISSUE_TEMPLATE/feature.yml
new file mode 100644
index 00000000..ef5c56c8
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature.yml
@@ -0,0 +1,54 @@
+name: Feature Request
+description: Suggest a new feature or improvement
+labels: ['enhancement']
+assignees: []
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for your interest in openSenseMap! Please fill out the sections below – clear requests make it easier for the team to evaluate and implement them!
+
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description:
+        Summarize what you would like to be implemented. Focus on what this
+        does, over the why you want it.
+      placeholder: |
+        A brief overview of the requested functionality.
+    validations:
+      required: true
+
+  - type: textarea
+    id: use-case
+    attributes:
+      label: Use case
+      description:
+        Explain the scenario or workflow that would benefit from this feature.
+      placeholder: |
+        Describe who would use it and how it improves their experience.
+    validations:
+      required: true
+
+  - type: textarea
+    id: implementation-ideas
+    attributes:
+      label: Implementation ideas (optional)
+      description:
+        If you already have an idea on how to implement this, this is the place
+        to put your thoughts.
+      placeholder: |
+        Possible approaches, libraries, or design considerations.
+    validations:
+      required: false
+
+  - type: textarea
+    id: additional-info
+    attributes:
+      label: Additional information (optional)
+      description:
+        Any other details, mockups, or links that help illustrate the request.
+    validations:
+      required: false
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 00000000..52777c8f
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,41 @@
+<!--
+    THANK YOU FOR CONTRIBUTING!
+-->
+
+## Type of Change
+
+<!--
+    Try sticking to one type of change per pull request for easier and faster code reviews.
+    Just put an x between the [] to check the box.
+-->
+
+- [ ] Dependency upgrade
+- [ ] Bug fix (non-breaking change)
+- [ ] Breaking change
+  - e.g. a fixed bug or new feature that may break something else
+- [ ] New feature
+- [ ] Code quality improvements
+  - e.g. refactoring, documentation, tests, tooling, ...
+
+## Implementation
+
+<!--
+    What did you change and why? How does it work?
+    Are there any trade-offs or limitations?
+-->
+
+## Checklist
+
+- [ ] I gave this pull request a meaningful title
+- [ ] My pull request is targeting the `dev` branch
+- [ ] I have added documentation to my code
+- [ ] I have deleted code that I have commented out
+
+## Additional Information
+
+<!--
+    Please link any additional issue, discussion or pull request here.
+    This helps us to keep everything tidy and managable.
+-->
+
+- This PR closes #