diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 92414377a0..0000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,32 +0,0 @@
----
-name: Bug Report
-about: Help us diagnose and fix bugs in Official AWS Provider
-labels: bug,needs:triage
-title: 
----
-<!--
-Thank you for helping to improve Official AWS Provider!
-
-Please be sure to search for open issues before raising a new one. We use issues
-for bug reports and feature requests.
--->
-
-### What happened?
-<!--
-Please let us know what behaviour you expected and how Official AWS Provider diverged from
-that behaviour.
--->
-
-### How can we reproduce it?
-<!--
-Help us to reproduce your bug as succinctly and precisely as possible. Artifacts
-such as example manifests or a script that triggers the issue are highly
-appreciated!
--->
-
-### What environment did it happen in?
-
-* Crossplane Version:
-* Provider Version:
-* Kubernetes Version: <!-- use `kubectl version` --> 
-* Kubernetes Distribution: <!-- EKS, AKS, GKE, OpenShift, etc. -->
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
new file mode 100644
index 0000000000..3938a48516
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -0,0 +1,105 @@
+name: Bug Report
+description: Help us diagnose and fix bugs in Official AWS Provider
+labels: bug,needs:triage
+title: "[Bug]: "
+body:
+  - type: markdown
+    attributes:
+      value: |
+        # Thank you for helping to improve Official AWS Provider!
+
+        - If you're not currently using the most recent version of the Upbound Official AWS Provider, we recommend upgrading. Your issue might have already been addressed in the latest release.
+
+  - type: checkboxes
+    id: existing_issue
+    attributes:
+      label: Is there an existing issue for this?
+      description: |
+        Please be sure to search for open issues before raising a new one.
+        If there is an existing issue, please vote for it by adding a 👍 reaction to it to help us prioritize it.
+      options:
+        - label: I have searched the existing issues
+          required: true
+ 
+  - type: textarea
+    id: affected
+    attributes:
+      label: Affected Resource(s)
+      description: Please provide the GVK of the affected resource(s). E.g. "ec2.aws.upbound.io/v1beta1 - Instance"
+      placeholder: "* ec2.aws.upbound.io/v1beta1 - Instance"
+    validations:
+      required: false
+
+  - type: textarea
+    id: mr
+    attributes:
+      label: Resource MRs required to reproduce the bug
+      description: Please provide the example manifests and configurations you use.
+    validations:
+      required: false
+
+  - type: textarea
+    id: repro
+    attributes:
+      label: Steps to Reproduce
+      description: Please list the steps required to reproduce the issue.
+    validations:
+      required: true
+
+  - type: textarea
+    id: behavior
+    attributes:
+      label: What happened?
+      description: What difference did you observe in the actual behavior compared to what you expected?
+    validations:
+      required: true
+
+  - type: textarea
+    id: log
+    attributes:
+      label: Relevant Error Output Snippet
+      description: |
+        If possible, provide a relevant log from the error or panic output.
+      render: shell
+    validations:
+      required: false
+
+  - type: input
+    id: crossplane_version
+    attributes:
+      label: Crossplane Version
+      placeholder: "X.Y.Z"
+    validations:
+      required: true
+
+  - type: input
+    id: provider_version
+    attributes:
+      label: Provider Version
+      placeholder: "X.Y.Z"
+    validations:
+      required: true
+
+  - type: input
+    id: kubernetes_version
+    attributes:
+      label: Kubernetes Version
+      placeholder: "use `kubectl version`"
+    validations:
+      required: false
+
+  - type: input
+    id: kubernetes_distribution
+    attributes:
+      label: Kubernetes Distribution
+      placeholder: "EKS, AKS, GKE, OpenShift, etc."
+    validations:
+      required: false
+
+  - type: textarea
+    id: additional_info
+    attributes:
+      label: Additional Info
+      description: Any additional information you want to add, related issue(s), pull requests, document references, situations specific to your environment, etc.
+    validations:
+      required: false