diff --git a/.github/ISSUE_TEMPLATE/architectural_spike.md b/.github/ISSUE_TEMPLATE/architectural_spike.md
new file mode 100644
index 000000000..0c8b2a337
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/architectural_spike.md
@@ -0,0 +1,9 @@
+---
+name: Architectural Spike
+about: Architectural Spike for distributed-systems-essentials
+title: ""
+labels: kind/spike
+assignees: "hbuie112358"
+---
+
+## Describe the architectural spike and reasoning
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 8daaa7e8b..292295751 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,26 +1,13 @@
 ---
 name: Bug report
-about: Report a bug in Dapr quickstarts
-title: ''
+about: Report a bug in distributed-systems-essentials
+title: ""
 labels: kind/bug
-assignees: ''
-
+assignees: "hbuie112358"
 ---
 
-<!-- Note: this issue queue is for bugs specifically in quickstart tutorials. If you are trying to report a bug with dapr itself please do so here: https://github.com/dapr/dapr/issues/new -->
-
-<!-- If you are just looking for help running the tutorials, you can head over to our community discord for quicker response times: https://aka.ms/dapr-discord -->
-
 ## Expected Behavior
 
-<!-- Briefly describe what you expect to happen -->
-
-
 ## Actual Behavior
 
-<!-- Briefly describe what is actually happening -->
-
-
 ## Steps to Reproduce the Problem
-
-<!-- How can a maintainer reproduce this issue (be detailed) -->
diff --git a/.github/ISSUE_TEMPLATE/discussion.md b/.github/ISSUE_TEMPLATE/discussion.md
index bb9b93147..3683fcc7e 100644
--- a/.github/ISSUE_TEMPLATE/discussion.md
+++ b/.github/ISSUE_TEMPLATE/discussion.md
@@ -1,12 +1,9 @@
 ---
 name: Discussion
-about: Start a discussion for Dapr quickstarts
+about: Start a discussion for distributed-systems-essentials
 title: ''
 labels: kind/discussion
-assignees: ''
+assignees: 'hbuie112358'
 
 ---
 
-<!-- Note: this issue queue is for discussions specifically for quickstart tutorials. If you are trying to have a discussion about dapr itself please create it here: https://github.com/dapr/dapr/issues/new -->
-
-<!-- If you are just looking for help running the tutorials, you can head over to our community discord for quicker response times: https://aka.ms/dapr-discord -->
diff --git a/.github/ISSUE_TEMPLATE/documentation.md b/.github/ISSUE_TEMPLATE/documentation.md
new file mode 100644
index 000000000..7be91dcd7
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/documentation.md
@@ -0,0 +1,9 @@
+---
+name: Documentation
+about: Documentation for distributed-systems-essentials
+title: ""
+labels: kind/documentation
+assignees: "hbuie112358"
+---
+
+## Describe the documentation
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 538fd773e..3c4a3f499 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,14 +1,9 @@
 ---
 name: Feature Request
-about: Create a Feature Request for Dapr quickstarts
-title: ''
+about: Create a feature request for distributed-systems-essentials
+title: ""
 labels: kind/enhancement
-assignees: ''
-
+assignees: "hbuie112358"
 ---
 
-<!-- Note: this issue queue is for features specifically in quickstart tutorials. If you are trying to request a feature with dapr itself please do so here: https://github.com/dapr/dapr/issues/new -->
-
-<!-- If you are just looking for help running the tutorials, you can head over to our community discord for quicker response times: https://aka.ms/dapr-discord -->
-
-## Describe the feature
+## Describe the feature and reasoning
diff --git a/.github/ISSUE_TEMPLATE/infrastructure.md b/.github/ISSUE_TEMPLATE/infrastructure.md
new file mode 100644
index 000000000..b9eff587b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/infrastructure.md
@@ -0,0 +1,9 @@
+---
+name: Infrastructure
+about: Make changes to the infrastructure in distributed-systems-essentials
+title: ""
+labels: kind/infrastructure
+assignees: "hbuie112358"
+---
+
+## Describe the changes to the infrastructure and reasoning
diff --git a/.github/ISSUE_TEMPLATE/proposal.md b/.github/ISSUE_TEMPLATE/proposal.md
deleted file mode 100644
index aec9ae5d2..000000000
--- a/.github/ISSUE_TEMPLATE/proposal.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-name: Proposal
-about: Create a proposal for Dapr quickstarts
-title: ''
-labels: kind/proposal
-assignees: ''
-
----
-
-<!-- Note: this issue queue is for proposals specifically related quickstart tutorials. If you are trying to propose something for dapr itself please do so here: https://github.com/dapr/dapr/issues/new -->
-
-<!-- If you are just looking for help running the tutorials, you can head over to our community discord for quicker response times: https://aka.ms/dapr-discord -->
-
-## Describe the proposal
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
index 605c51d69..a59166230 100644
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -1,14 +1,9 @@
 ---
 name: Question
-about: Ask a question about Dapr quickstarts
-title: ''
+about: Ask a question about distributed-systems-essentials
+title: ""
 labels: kind/question
-assignees: ''
-
+assignees: "hbuie112358"
 ---
 
-<!-- Note: this issue queue is for questions  specifically about quickstart tutorials. If you are trying to ask a question regarding dapr itself please do so here: https://github.com/dapr/dapr/issues/new -->
-
-<!-- If you are just looking for help running the tutorials, you can head over to our community discord for quicker response times: https://aka.ms/dapr-discord -->
-
 ## Ask your question here
diff --git a/.github/ISSUE_TEMPLATE/refactor.md b/.github/ISSUE_TEMPLATE/refactor.md
new file mode 100644
index 000000000..cc159bb8b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/refactor.md
@@ -0,0 +1,9 @@
+---
+name: Refactor
+about: Refactor codebase in distributed-systems-essentials
+title: ""
+labels: kind/refactor
+assignees: "hbuie112358"
+---
+
+## Describe the refactor and reasoning