diff --git a/.github/ISSUE_TEMPLATE/product-submission-template.md b/.github/ISSUE_TEMPLATE/product-submission-template.md
deleted file mode 100644
index a92609b..0000000
--- a/.github/ISSUE_TEMPLATE/product-submission-template.md
+++ /dev/null
@@ -1,27 +0,0 @@
----
-name: Product Submission Template
-about: Template for product submissions of all publicly available information
-  and vendor-supplied advisories regarding the log4j vulnerability.
----
-# Submission Template #
-
-Please provide the following information.
-
-- Vendor Name
-- Product Name
-- Version(s) affected
-- Status: Please choose from one of the following - Unknown, Affected,
-  Not Affected, Fixed, and Under Investigation.
-- Update Available: Yes or No (If Yes, please provide link to information)
-- Notes
-- References
-- Last Updated: Date of last update
-
-For questions about choice for status, please see the information below.
-
-- Unknown - Status unknown. Default choice.
-- Affected - Reported to be affected by CVE-2021-44228.
-- Not Affected - Reported to NOT be affected by CVE-2021-44228 and no further
-  action necessary.
-- Fixed - Patch and/or mitigations available (see provided links).
-- Under Investigation - Vendor investigating status.
diff --git a/.github/ISSUE_TEMPLATE/product-submission-template.yml b/.github/ISSUE_TEMPLATE/product-submission-template.yml
new file mode 100644
index 0000000..c5a66b1
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/product-submission-template.yml
@@ -0,0 +1,73 @@
+---
+name: Submit a Product
+description: Submit a product to the database
+title: "[Product Submission]: <vendor> - <product>"
+body:
+  - type: markdown
+    attributes:
+      value: |
+        For questions about choice for status, please see the information below.
+
+        - Unknown - Status unknown. Default choice.
+        - Affected - Reported to be affected by CVE-2021-44228.
+        - Not Affected - Reported to NOT be affected by CVE-2021-44228 and no
+          further action necessary.
+        - Fixed - Patch and/or mitigations available (see provided links).
+        - Under Investigation - Vendor investigating status.
+  - type: input
+    id: product-vendor
+    attributes:
+      label: Product vendor
+      description: Who is the vendor for the product?
+    validations:
+      required: true
+  - type: input
+    id: product-name
+    attributes:
+      label: Product name
+      description: What is the product?
+    validations:
+      required: true
+  - type: input
+    id: product-versions
+    attributes:
+      label: Product version(s)
+      description: What version(s) of the product are affected?
+    validations:
+      required: true
+  - type: dropdown
+    id: product-status
+    attributes:
+      label: Product status
+      description: What is the current status of the affected product?
+      options:
+        - Unknown
+        - Affected
+        - Not Affected
+        - Fixed
+        - Under Investigation
+    validations:
+      required: true
+  - type: dropdown
+    id: product-updated
+    attributes:
+      label: Product update available
+      description: Is there an update available for the product?
+      options:
+        - "Yes"
+        - "No"
+    validations:
+      required: true
+  - type: input
+    id: product-update-link
+    attributes:
+      label: Product update link
+      description: If an update is available where can it be found?
+  - type: textarea
+    id: product-notes
+    attributes:
+      label: Notes
+  - type: textarea
+    id: product-references
+    attributes:
+      label: References