diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index 89d8b1bcf615d..0000000000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,17 +0,0 @@
-Attach (recommended) or Link to PDF file here:
-
-Configuration:
-- Web browser and its version:
-- Operating system and its version:
-- PDF.js version:
-- Is a browser extension:
-
-Steps to reproduce the problem:
-1. 
-2.
-
-What is the expected behavior? (add screenshot)
-
-What went wrong? (add screenshot)
-
-Link to a viewer (if hosted on a site other than mozilla.github.io/pdf.js or as Firefox/Chrome extension):
diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
new file mode 100644
index 0000000000000..9a55ac44e1f40
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -0,0 +1,76 @@
+name: Bug Report
+description: Report a bug in PDF.js
+title: "[Bug]: "
+body:
+  - type: textarea
+    attributes:
+      label: Attach (recommended) or Link to PDF file
+    validations:
+      required: true
+
+  - type: markdown
+    attributes: { value: "---" }
+
+  - type: input
+    attributes:
+      label: Web browser and its version
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Operating system and its version
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: PDF.js version
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: Is the bug present in the latest PDF.js version?
+      options: ["Yes", "No"]
+      default: 0
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: Is a browser extension
+      options: ["Yes", "No"]
+      default: 1
+    validations:
+      required: true
+
+  - type: markdown
+    attributes: { value: "---" }
+
+  - type: textarea
+    attributes:
+      label: Steps to reproduce the problem
+      placeholder: "1.\n2."
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: What is the expected behavior?
+      description: Also add a screenshot
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: What went wrong?
+      description: Also add a screenshot
+    validations:
+      required: true
+
+  - type: input
+    attributes:
+      label: Link to a viewer
+      description: Needed if hosted on a site other than mozilla.github.io/pdf.js or as Firefox/Chrome extension
+
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: Do you have anything to add that doesn't fit in the issue template?
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000000000..72995bf676fe5
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,8 @@
+blank_issues_enabled: true
+contact_links:
+  - name: Need help?
+    url: https://github.com/mozilla/pdf.js/discussions
+    about: If you need help on how to use PDF.js, please open a discussion where other community members can reply
+  - name: Security report
+    url: https://bugzilla.mozilla.org/enter_bug.cgi?product=Firefox&component=PDF%20Viewer&groups=firefox-core-security
+    about: Please report security vulnerabilities in Firefox's bug tracker, making sure that the checkbox in the "Security" section is selected
diff --git a/.github/ISSUE_TEMPLATE/feature.yml b/.github/ISSUE_TEMPLATE/feature.yml
new file mode 100644
index 0000000000000..145f4edf6df2c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature.yml
@@ -0,0 +1,23 @@
+name: Feature request
+description: Propose a new feature or enhancement for PDF.js
+title: "[Feature]: "
+body:
+  - type: dropdown
+    attributes:
+      label: Is the feature relevant to the Firefox PDF Viewer?
+      options: ["Yes", "No"]
+      default: 1
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Feature description
+      description: What new feature would you like PDF.js to have? Why would it be useful? What are the current workarounds?
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Other PDF viewers
+      description: Do other PDF viewers implement similar functionality? Add descriptions, links, and/or screenshots.