diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 999e90fbe..0eb33e46c 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -3,8 +3,9 @@ name: Bug report
 about: Did you encounter something unexpected or incorrect in the Dataverse Frontend?
   We'd like to hear about it!
 title: ''
-labels: 'Type: Bug'
+labels: ''
 assignees: ''
+
 ---
 
 <!--
diff --git a/.github/ISSUE_TEMPLATE/feature-complete.md b/.github/ISSUE_TEMPLATE/feature-complete.md
new file mode 100644
index 000000000..5c941c555
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-complete.md
@@ -0,0 +1,28 @@
+---
+name: Feature Complete
+about: 'This template is for items related to the "Feature Complete" project. '
+title: ''
+labels: SPA Feature Complete
+assignees: ''
+
+---
+
+## Summary
+
+<!-- Briefly describe the problem or requested improvement. -->
+
+## User need
+
+As a **[user role]**, I want **[goal]**, so that **[benefit]**.
+
+## Current behavior
+
+<!-- What currently happens? For a new feature, describe the current limitation. -->
+
+## Expected behavior
+
+<!-- Describe the desired, observable behavior. -->
+
+## Steps to reproduce
+
+<!-- Required for bugs; remove if not applicable. -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index e1fa50e35..4a92ae6b9 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -2,8 +2,9 @@
 name: Feature request
 about: Suggest an idea or new feature for the Dataverse software!
 title: 'Feature Request/Idea:'
-labels: 'Type: Feature'
+labels: ''
 assignees: ''
+
 ---
 
 <!--