diff --git a/.github/ISSUE_TEMPLATE/bug-openapi-typescript.md b/.github/ISSUE_TEMPLATE/01_openapi-typescript-bug.yml
similarity index 91%
rename from .github/ISSUE_TEMPLATE/bug-openapi-typescript.md
rename to .github/ISSUE_TEMPLATE/01_openapi-typescript-bug.yml
index 63509a33b..ac01c02f3 100644
--- a/.github/ISSUE_TEMPLATE/bug-openapi-typescript.md
+++ b/.github/ISSUE_TEMPLATE/01_openapi-typescript-bug.yml
@@ -1,9 +1,9 @@
----
-name: "Bug report: openapi-typescript"
-about: For the openapi-typescript library
-title: ""
-labels: openapi-ts, bug
-assignees: ""
+name: "openapi-typescript: Bug report"
+about: Report a bug or unexpected behavior
+labels:
+  - openapi-ts
+  - bug
+  - triage
 body:
   - type: input
     attributes:
@@ -50,4 +50,3 @@ body:
         - 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/feature-openapi-typescript.md b/.github/ISSUE_TEMPLATE/01_openapi-typescript-feat.yml
similarity index 84%
rename from .github/ISSUE_TEMPLATE/feature-openapi-typescript.md
rename to .github/ISSUE_TEMPLATE/01_openapi-typescript-feat.yml
index a46853e9d..9ffdc919e 100644
--- a/.github/ISSUE_TEMPLATE/feature-openapi-typescript.md
+++ b/.github/ISSUE_TEMPLATE/01_openapi-typescript-feat.yml
@@ -1,9 +1,9 @@
----
-name: "Feature request: openapi-typescript"
-about: For the openapi-typescript library
+name: "openapi-typescript: Feature request"
+about: Propose new functionality or a breaking change
 title: ""
-labels: openapi-ts, enhancement, help wanted
-assignees: ""
+labels:
+  - openapi-ts
+  - enhancement
 body:
   - type: textarea
     id: description
@@ -24,4 +24,3 @@ body:
     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/bug-openapi-fetch.md b/.github/ISSUE_TEMPLATE/02_openapi-fetch-bug.yml
similarity index 88%
rename from .github/ISSUE_TEMPLATE/bug-openapi-fetch.md
rename to .github/ISSUE_TEMPLATE/02_openapi-fetch-bug.yml
index 6e50e1289..11fd702fa 100644
--- a/.github/ISSUE_TEMPLATE/bug-openapi-fetch.md
+++ b/.github/ISSUE_TEMPLATE/02_openapi-fetch-bug.yml
@@ -1,9 +1,9 @@
----
-name: "Bug report: openapi-fetch"
-about: For the openapi-fetch library
-title: ""
-labels: openapi-fetch, bug
-assignees: ""
+name: "openapi-fetch: Bug report"
+about: Report a bug or unexpected behavior
+labels:
+  - openapi-fetch
+  - bug
+  - triage
 body:
   - type: input
     attributes:
@@ -36,4 +36,3 @@ body:
     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-fetch.md b/.github/ISSUE_TEMPLATE/02_openapi-fetch-feat.yml
similarity index 82%
rename from .github/ISSUE_TEMPLATE/feature-openapi-fetch.md
rename to .github/ISSUE_TEMPLATE/02_openapi-fetch-feat.yml
index 6e33023d8..fd3bd7ea3 100644
--- a/.github/ISSUE_TEMPLATE/feature-openapi-fetch.md
+++ b/.github/ISSUE_TEMPLATE/02_openapi-fetch-feat.yml
@@ -1,9 +1,9 @@
----
-name: "Feature request: openapi-fetch"
-about: For the openapi-fetch library
+name: "openapi-fetch: Feature request"
+about: Propose new functionality or a breaking change
 title: ""
-labels: openapi-fetch, enhancement, help wanted
-assignees: ""
+labels:
+  - openapi-fetch
+  - enhancement
 body:
   - type: textarea
     id: description
@@ -24,4 +24,3 @@ body:
     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/03_openapi-react-query-bug.yml
similarity index 87%
rename from .github/ISSUE_TEMPLATE/bug-openapi-react-query.md
rename to .github/ISSUE_TEMPLATE/03_openapi-react-query-bug.yml
index 4a25a62aa..695a39c6f 100644
--- a/.github/ISSUE_TEMPLATE/bug-openapi-react-query.md
+++ b/.github/ISSUE_TEMPLATE/03_openapi-react-query-bug.yml
@@ -1,9 +1,9 @@
----
-name: "Bug report: openapi-react-query"
-about: For the openapi-react-query library
-title: ""
-labels: openapi-react-query, bug
-assignees: ""
+name: "openapi-react-query: Bug report"
+about: Report a bug or unexpected behavior
+labels:
+  - openapi-react-query
+  - bug
+  - triage
 body:
   - type: input
     attributes:
@@ -36,4 +36,3 @@ body:
     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-react-query.md b/.github/ISSUE_TEMPLATE/03_openapi-react-query-feat.yml
similarity index 81%
rename from .github/ISSUE_TEMPLATE/feature-openapi-react-query.md
rename to .github/ISSUE_TEMPLATE/03_openapi-react-query-feat.yml
index 25b7b6dcd..3952dd8bd 100644
--- a/.github/ISSUE_TEMPLATE/feature-openapi-react-query.md
+++ b/.github/ISSUE_TEMPLATE/03_openapi-react-query-feat.yml
@@ -1,9 +1,9 @@
----
-name: "Feature request: openapi-react-query"
-about: For the openapi-react-query library
+name: "openapi-react-query: Feature request"
+about: Propose new functionality or a breaking change
 title: ""
-labels: openapi-react-query, enhancement, help wanted
-assignees: ""
+labels:
+  - openapi-react-query
+  - enhancement
 body:
   - type: textarea
     id: description
@@ -24,4 +24,3 @@ body:
     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-swr-openapi.md b/.github/ISSUE_TEMPLATE/04_swr-openapi-bug.yml
similarity index 89%
rename from .github/ISSUE_TEMPLATE/bug-swr-openapi.md
rename to .github/ISSUE_TEMPLATE/04_swr-openapi-bug.yml
index 708cc91ed..165c98045 100644
--- a/.github/ISSUE_TEMPLATE/bug-swr-openapi.md
+++ b/.github/ISSUE_TEMPLATE/04_swr-openapi-bug.yml
@@ -1,9 +1,8 @@
----
-name: "Bug report: swr-openapi"
-about: For the swr-openapi library
-title: ""
-labels: swr-openapi, bug
-assignees: ""
+name: "swr-openapi: Bug report"
+about: Report a bug or unexpected behavior
+labels:
+  - swr-openapi
+  - bug
 body:
   - type: input
     attributes:
@@ -36,4 +35,3 @@ body:
     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-swr-openapi.md b/.github/ISSUE_TEMPLATE/04_swr-openapi-feat.yml
similarity index 83%
rename from .github/ISSUE_TEMPLATE/feature-swr-openapi.md
rename to .github/ISSUE_TEMPLATE/04_swr-openapi-feat.yml
index bb5ccf5dc..e9acbe8dd 100644
--- a/.github/ISSUE_TEMPLATE/feature-swr-openapi.md
+++ b/.github/ISSUE_TEMPLATE/04_swr-openapi-feat.yml
@@ -1,9 +1,9 @@
----
-name: "Feature request: swr-openapi"
-about: For the swr-openapi library
+name: "swr-openapi: Feature request"
+about: Propose new functionality or a breaking change
 title: ""
-labels: swr-openapi, enhancement, help wanted
-assignees: ""
+labels:
+  - swr-openapi
+  - enhancement
 body:
   - type: textarea
     id: description
@@ -24,4 +24,3 @@ body:
     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/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000..3ba13e0ce
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1 @@
+blank_issues_enabled: false