diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
new file mode 100644
index 00000000000..67f1009dcc4
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -0,0 +1,68 @@
+name: Bug Report
+description: Create a report to help us improve Juju
+labels:
+  - kind/bug
+  - needs-triage
+body:
+  - type: textarea
+    id: Description
+    attributes:
+      label: Description
+      description: "Please describe the unexpected behaviour: "
+      placeholder: ex. "`juju status` returns the error `not found`"
+    validations:
+      required: true
+
+  - type: input
+    id: Version
+    attributes:
+      label: Juju version
+      description: "What version of Juju are you using?"
+      placeholder: ex. 3.6.1
+    validations:
+      required: true
+
+  - type: dropdown
+    id: Cloud
+    attributes:
+      label: Cloud
+      description: Which cloud(s) are you using?
+      multiple: true
+      options:
+        - AWS
+        - Azure
+        - Equinix
+        - GCP
+        - Kubernetes
+        - LXD
+        - MAAS
+        - Manual
+        - OpenStack
+        - Oracle
+        - vSphere
+
+  - type: textarea
+    id: Expected-Behaviour
+    attributes:
+      label: Expected behaviour
+      description: "Describe of what you expected to happen: "
+      placeholder: ex. "`juju status` should tell me what was not found"
+    validations:
+      required: true
+
+  - type: textarea
+    id: Reproduction-Steps
+    attributes:
+      label: "Reproduce / Test"
+      description: "Steps to reproduce the unexpected behaviour: "
+      placeholder: ex. "juju bootstrap aws && juju status"
+    validations:
+      required: true
+
+  - type: textarea
+    id: Info-Notes
+    attributes:
+      label: "Notes & References"
+      description: "Please add anything to help diagnose the issue e.g. controller debug logs, output from kubectl, etc."
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 00000000000..50837704308
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: true
+contact_links:
+  - name: Documentation issue
+    url: https://github.com/juju/docs/issues/new
+    about: Please report documentation issues on juju/docs repository
diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml
new file mode 100644
index 00000000000..9741f9e83bf
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -0,0 +1,31 @@
+name: Feature Request
+description: Suggest a new feature for Juju
+labels:
+  - kind/feature
+  - needs-triage
+body:
+  - type: textarea
+    id: Problem-Description
+    attributes:
+      label: Problem description
+      description: "Describe the problem/use-case: "
+      placeholder: ex. "I need to be able to see the local time on each machine."
+    validations:
+      required: true
+
+  - type: textarea
+    id: Desired-Behaviour
+    attributes:
+      label: Desired behaviour
+      description: "Describe the desired behaviour: "
+      placeholder: ex. "`juju status` could return the current time reported by each machine."
+    validations:
+      required: true
+
+  - type: textarea
+    id: Info-Notes
+    attributes:
+      label: "Notes & References"
+      description: "Please add relevant notes, other related issues/PRs, anything to help build a solution."
+    validations:
+      required: false
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
deleted file mode 100644
index c2d0deb1e0f..00000000000
--- a/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-# Thank you for finding a Juju Issue!
-
-The Juju project uses [https://bugs.launchpad.net/juju](https://bugs.launchpad.net/juju) to track issues.