diff --git a/.github/ISSUE_TEMPLATE/bug-openapi-fetch.md b/.github/ISSUE_TEMPLATE/bug-openapi-fetch.md
new file mode 100644
index 000000000..6e50e1289
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-openapi-fetch.md
@@ -0,0 +1,39 @@
+---
+name: "Bug report: openapi-fetch"
+about: For the openapi-fetch library
+title: ""
+labels: openapi-fetch, bug
+assignees: ""
+body:
+  - type: input
+    attributes:
+      label: Version
+      placeholder: x.x.x
+    validations:
+      required: true
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: A brief description of the bug. Provide either a screenshot or the full error message!
+    validations:
+      required: true
+  - type: textarea
+    id: repro
+    attributes:
+      label: Reproduction
+      description: How can this be reproduced / when did the error occur? Does the issue occur in a specific browser, or all browsers? Bonus points for a GitHub repository link.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Expected result
+      description: (In case it’s not obvious)
+    validations:
+      required: true
+  - type: checkboxes
+    id: checklist
+    attributes:
+      options:
+        - label: I’m willing to open a PR (see [CONTRIBUTING.md](https://github.com/openapi-ts/openapi-typescript/blob/main/packages/openapi-fetch/CONTRIBUTING.md))
+---
diff --git a/.github/ISSUE_TEMPLATE/bug-openapi-react-query.md b/.github/ISSUE_TEMPLATE/bug-openapi-react-query.md
new file mode 100644
index 000000000..4a25a62aa
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-openapi-react-query.md
@@ -0,0 +1,39 @@
+---
+name: "Bug report: openapi-react-query"
+about: For the openapi-react-query library
+title: ""
+labels: openapi-react-query, bug
+assignees: ""
+body:
+  - type: input
+    attributes:
+      label: Version
+      placeholder: x.x.x
+    validations:
+      required: true
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: A brief description of the bug. Provide either a screenshot or the full error message!
+    validations:
+      required: true
+  - type: textarea
+    id: repro
+    attributes:
+      label: Reproduction
+      description: How can this be reproduced / when did the error occur? Does the issue occur in a specific browser, or all browsers? Bonus points for a GitHub repository link.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Expected result
+      description: (In case it’s not obvious)
+    validations:
+      required: true
+  - type: checkboxes
+    id: checklist
+    attributes:
+      options:
+        - label: I’m willing to open a PR (see [CONTRIBUTING.md](https://github.com/openapi-ts/openapi-typescript/blob/main/packages/openapi-react-query/CONTRIBUTING.md))
+---
diff --git a/.github/ISSUE_TEMPLATE/bug-openapi-typescript.md b/.github/ISSUE_TEMPLATE/bug-openapi-typescript.md
new file mode 100644
index 000000000..63509a33b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-openapi-typescript.md
@@ -0,0 +1,53 @@
+---
+name: "Bug report: openapi-typescript"
+about: For the openapi-typescript library
+title: ""
+labels: openapi-ts, bug
+assignees: ""
+body:
+  - type: input
+    attributes:
+      label: openapi-typescript version
+      placeholder: x.x.x
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Node.js version
+      placeholder: 20.x.x
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: OS + version
+      placeholder: macOS 15.1.1
+    validations:
+      required: true
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: A brief description of the bug. Provide either a screenshot or the full error message!
+    validations:
+      required: true
+  - type: textarea
+    id: repro
+    attributes:
+      label: Reproduction
+      description: How can this be reproduced / when did the error occur? Does the issue occur in a specific browser, or all browsers? Bonus points for a GitHub repository link.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Expected result
+      description: (In case it’s not obvious)
+    validations:
+      required: true
+  - type: checkboxes
+    id: checklist
+    attributes:
+      options:
+        - label: My OpenAPI schema is valid and passes the [Redocly validator](https://redocly.com/docs/cli/commands/lint/) (`npx @redocly/cli@latest lint`)
+          required: true
+        - label: I’m willing to open a PR (see [CONTRIBUTING.md](https://github.com/openapi-ts/openapi-typescript/blob/main/packages/openapi-typescript/CONTRIBUTING.md))
+---
diff --git a/.github/ISSUE_TEMPLATE/bug-report-fetch.md b/.github/ISSUE_TEMPLATE/bug-report-fetch.md
deleted file mode 100644
index fdfef2d94..000000000
--- a/.github/ISSUE_TEMPLATE/bug-report-fetch.md
+++ /dev/null
@@ -1,23 +0,0 @@
----
-name: "Bug report: openapi-fetch"
-about: For the openapi-fetch library
-title: ""
-labels: openapi-fetch, bug
-assignees: ""
----
-
-**Description**
-
-_A brief description of the bug. Provide either a screenshot or the full error message_
-
-**Reproduction**
-
-_How can this be reproduced / when did the error occur? Does the issue occur in a specific browser, or all browsers?_
-
-**Expected result**
-
-_(in case it’s not obvious)_
-
-**Checklist**
-
-- [ ] I’m willing to open a PR (see [CONTRIBUTING.md](https://github.com/openapi-ts/openapi-typescript/blob/main/packages/openapi-fetch/CONTRIBUTING.md))
diff --git a/.github/ISSUE_TEMPLATE/bug-report-ts.md b/.github/ISSUE_TEMPLATE/bug-report-ts.md
deleted file mode 100644
index 4cab1fc33..000000000
--- a/.github/ISSUE_TEMPLATE/bug-report-ts.md
+++ /dev/null
@@ -1,34 +0,0 @@
----
-name: "Bug report: openapi-typescript"
-about: For the openapi-typescript library
-title: ""
-labels: openapi-ts, bug
-assignees: ""
----
-
-**Description**
-
-_A brief description of the bug._
-
-```
-Paste full error message
-```
-
-| Name                 | Version                      |
-| :------------------- | :--------------------------- |
-| `openapi-typescript` | `x.x.x`                      |
-| Node.js              | `x.x.x`                      |
-| OS + version         | `macOS 13, Windows 11, etc.` |
-
-**Reproduction**
-
-_How can this be reproduced / when did the error occur?_
-
-**Expected result**
-
-_(in case it’s not obvious)_
-
-**Checklist**
-
-- [ ] My OpenAPI schema passes the [Redocly validator](https://redocly.com/docs/cli/commands/lint/) (`npx @redocly/cli@latest lint`)
-- [ ] I’m willing to open a PR (see [CONTRIBUTING.md](https://github.com/openapi-ts/openapi-typescript/blob/main/packages/openapi-typescript/CONTRIBUTING.md))
diff --git a/.github/ISSUE_TEMPLATE/bug-swr-openapi.md b/.github/ISSUE_TEMPLATE/bug-swr-openapi.md
new file mode 100644
index 000000000..708cc91ed
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-swr-openapi.md
@@ -0,0 +1,39 @@
+---
+name: "Bug report: swr-openapi"
+about: For the swr-openapi library
+title: ""
+labels: swr-openapi, bug
+assignees: ""
+body:
+  - type: input
+    attributes:
+      label: Version
+      placeholder: x.x.x
+    validations:
+      required: true
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: A brief description of the bug. Provide either a screenshot or the full error message!
+    validations:
+      required: true
+  - type: textarea
+    id: repro
+    attributes:
+      label: Reproduction
+      description: How can this be reproduced / when did the error occur? Does the issue occur in a specific browser, or all browsers? Bonus points for a GitHub repository link.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Expected result
+      description: (In case it’s not obvious)
+    validations:
+      required: true
+  - type: checkboxes
+    id: checklist
+    attributes:
+      options:
+        - label: I’m willing to open a PR (see [CONTRIBUTING.md](https://github.com/openapi-ts/openapi-typescript/blob/main/packages/swr-openapi/CONTRIBUTING.md))
+---
diff --git a/.github/ISSUE_TEMPLATE/feature-openapi-fetch.md b/.github/ISSUE_TEMPLATE/feature-openapi-fetch.md
new file mode 100644
index 000000000..6e33023d8
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-openapi-fetch.md
@@ -0,0 +1,27 @@
+---
+name: "Feature request: openapi-fetch"
+about: For the openapi-fetch library
+title: ""
+labels: openapi-fetch, enhancement, help wanted
+assignees: ""
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: Brief description of the problem you’re trying to solve, and why this could be useful.
+    validations:
+      required: true
+  - type: textarea
+    id: proposal
+    attributes:
+      label: Proposal
+      description: Describe the proposed syntax change. Please reference any prior art or similar examples.
+    validations:
+      required: true
+  - type: checkboxes
+    id: checklist
+    attributes:
+      options:
+        - label: I’m willing to open a PR (see [CONTRIBUTING.md](https://github.com/openapi-ts/openapi-typescript/blob/main/packages/openapi-fetch/CONTRIBUTING.md))
+---
diff --git a/.github/ISSUE_TEMPLATE/feature-openapi-react-query.md b/.github/ISSUE_TEMPLATE/feature-openapi-react-query.md
new file mode 100644
index 000000000..25b7b6dcd
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-openapi-react-query.md
@@ -0,0 +1,27 @@
+---
+name: "Feature request: openapi-react-query"
+about: For the openapi-react-query library
+title: ""
+labels: openapi-react-query, enhancement, help wanted
+assignees: ""
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: Brief description of the problem you’re trying to solve, and why this could be useful.
+    validations:
+      required: true
+  - type: textarea
+    id: proposal
+    attributes:
+      label: Proposal
+      description: Describe the proposed syntax change. Please reference any prior art or similar examples.
+    validations:
+      required: true
+  - type: checkboxes
+    id: checklist
+    attributes:
+      options:
+        - label: I’m willing to open a PR (see [CONTRIBUTING.md](https://github.com/openapi-ts/openapi-typescript/blob/main/packages/openapi-react-query/CONTRIBUTING.md))
+---
diff --git a/.github/ISSUE_TEMPLATE/feature-openapi-typescript.md b/.github/ISSUE_TEMPLATE/feature-openapi-typescript.md
new file mode 100644
index 000000000..a46853e9d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-openapi-typescript.md
@@ -0,0 +1,27 @@
+---
+name: "Feature request: openapi-typescript"
+about: For the openapi-typescript library
+title: ""
+labels: openapi-ts, enhancement, help wanted
+assignees: ""
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: Brief description of the problem you’re trying to solve, and why this could be useful.
+    validations:
+      required: true
+  - type: textarea
+    id: proposal
+    attributes:
+      label: Proposal
+      description: Outline the change to the library. If this is for the CLI, propose a flag name and/or workflow. If this is for Node API, propose how this would be consumed. Reference any prior art or similar examples.
+    validations:
+      required: true
+  - type: checkboxes
+    id: checklist
+    attributes:
+      options:
+        - label: I’m willing to open a PR (see [CONTRIBUTING.md](https://github.com/openapi-ts/openapi-typescript/blob/main/packages/openapi-typescript/CONTRIBUTING.md))
+---
diff --git a/.github/ISSUE_TEMPLATE/feature-request-fetch.md b/.github/ISSUE_TEMPLATE/feature-request-fetch.md
deleted file mode 100644
index 9fc92d933..000000000
--- a/.github/ISSUE_TEMPLATE/feature-request-fetch.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-name: "Feature request: openapi-fetch"
-about: For the openapi-fetch library
-title: ""
-labels: openapi-fetch, enhancement, help wanted
-assignees: ""
----
-
-**Description**
-
-_Brief description of the problem you’re trying to solve, and why this could be useful._
-
-**Proposal**
-
-_Write out the proposed syntax change. Please reference any prior art or similar examples._
-
-**Checklist**
-
-- [ ] I’m willing to open a PR for this (see [CONTRIBUTING.md](https://github.com/openapi-ts/openapi-typescript/blob/main/packages/openapi-fetch/CONTRIBUTING.md))
diff --git a/.github/ISSUE_TEMPLATE/feature-request-ts.md b/.github/ISSUE_TEMPLATE/feature-request-ts.md
deleted file mode 100644
index 1363a7f86..000000000
--- a/.github/ISSUE_TEMPLATE/feature-request-ts.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-name: "Feature request: openapi-typescript"
-about: For the openapi-typescript library
-title: ""
-labels: openapi-ts, enhancement, help wanted
-assignees: ""
----
-
-**Description**
-
-_Brief description of the problem you’re trying to solve, and why this could be useful._
-
-**Proposal**
-
-_Outline the change to the library. If this is for the CLI, propose a flag name and/or workflow. If this is for Node API, propose how this would be consumed. Reference any prior art or similar examples._
-
-**Checklist**
-
-- [ ] I’m willing to open a PR for this (see [CONTRIBUTING.md](https://github.com/openapi-ts/openapi-typescript/blob/main/packages/openapi-typescript/CONTRIBUTING.md))
diff --git a/.github/ISSUE_TEMPLATE/feature-swr-openapi.md b/.github/ISSUE_TEMPLATE/feature-swr-openapi.md
new file mode 100644
index 000000000..bb5ccf5dc
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-swr-openapi.md
@@ -0,0 +1,27 @@
+---
+name: "Feature request: swr-openapi"
+about: For the swr-openapi library
+title: ""
+labels: swr-openapi, enhancement, help wanted
+assignees: ""
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: Brief description of the problem you’re trying to solve, and why this could be useful.
+    validations:
+      required: true
+  - type: textarea
+    id: proposal
+    attributes:
+      label: Proposal
+      description: Describe the proposed syntax change. Please reference any prior art or similar examples.
+    validations:
+      required: true
+  - type: checkboxes
+    id: checklist
+    attributes:
+      options:
+        - label: I’m willing to open a PR (see [CONTRIBUTING.md](https://github.com/openapi-ts/openapi-typescript/blob/main/packages/swr-openapi/CONTRIBUTING.md))
+---