diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
index 846f953a2..56cb59e2a 100644
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -1,7 +1,7 @@
 name: Bug Report
 description: File a bug report.
 title: "ERROR: "
-labels: ["Bug", "Triage"]
+labels: ["BUG", "Triage"]
 projects: ["onsonr/39"]
 body:
   - type: textarea
diff --git a/.github/ISSUE_TEMPLATE/okr.yml b/.github/ISSUE_TEMPLATE/okr.yml
index 7b4f542a4..4014417c1 100644
--- a/.github/ISSUE_TEMPLATE/okr.yml
+++ b/.github/ISSUE_TEMPLATE/okr.yml
@@ -1,42 +1,40 @@
-name: Default Todo
-description: Break down feature requirements into tasks.
-title: "Name of the new task"
-labels: ["TODO"]
+name: Tracking issue
+description: Use this template for tracking new features.
+title: "(v0.6): FEATURE NAME"
+labels: ["OKR"]
+projects: ["onsonr/37"]
 body:
   - type: checkboxes
     attributes:
-      label: Is this associated with a tracking issue?
-      description: This is a implementation issue for coompletion of a task for a Objective.
+      label: Is this associated with a milestone?
+      description: This is a tracking issue for tracking a new feature for a given milestone.
       options:
-        - label: I have confirmed this is associated with a tracking issue.
+        - label: I have confirmed this is an OKR tracking issue
           required: true
   - type: textarea
     attributes:
-      label: Description
-      description: Write a "prompt" for the task.
+      label: Objective
+      description: Explain the objective of the feature.
     validations:
       required: false
   - type: textarea
     attributes:
-      label: Associated Files
+      label: Task List
       description: |
-        - [proto/did/v1/state.proto](https://github.com/onsonr/sonr/blob/develop/proto/did/v1/state.proto)
-        - [proto/did/v1/tx.proto](https://github.com/onsonr/sonr/blob/develop/proto/did/v1/tx.proto)
-      render: markdown
+        Break down of tasks to complete the objective.
       value: |
-        - [proto/did/v1/state.proto](https://github.com/onsonr/sonr/blob/develop/proto/did/v1/state.proto)
-        - [proto/did/v1/tx.proto](https://github.com/onsonr/sonr/blob/develop/proto/did/v1/tx.proto)
+        - [ ] Task 1
+        - [ ] Task 2
+        - [ ] Task 3
+      render: markdown
     validations:
       required: false
   - type: textarea
     attributes:
-      label: References
+      label: Additional Resources
       description: |
-        - [Cosmos ORM Docs](https://github.com/cosmos/orm)
-        - [DID Document Spec](https://docs.cosmos.network)
-      render: markdown
-      value: |
-        - [Cosmos ORM Docs](https://github.com/cosmos/orm)
-        - [DID Document Spec](https://docs.cosmos.network)
+        Links? References? Anything that will give us more context about the issue you are encountering!
+
+        Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
     validations:
       required: false
diff --git a/.github/ISSUE_TEMPLATE/todo.yml b/.github/ISSUE_TEMPLATE/todo.yml
index e69de29bb..63feccbfa 100644
--- a/.github/ISSUE_TEMPLATE/todo.yml
+++ b/.github/ISSUE_TEMPLATE/todo.yml
@@ -0,0 +1,41 @@
+name: Default Todo
+description: Break down feature requirements into tasks.
+title: "Name of the new task"
+labels: ["TODO"]
+projects: ["onsonr/37"]
+body:
+  - type: checkboxes
+    attributes:
+      label: Is this associated with a tracking issue?
+      description: This is a implementation issue for coompletion of a task for a Objective.
+      options:
+        - label: I have confirmed this is associated with a tracking issue.
+          required: true
+  - type: textarea
+    attributes:
+      label: Description
+      description: The expected deliverable of the task.
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Associated Files
+      description: |
+        These files will be modified by this task.
+      render: markdown
+      value: |
+        - [proto/did/v1/state.proto](https://github.com/onsonr/sonr/blob/develop/proto/did/v1/state.proto)
+        - [proto/did/v1/tx.proto](https://github.com/onsonr/sonr/blob/develop/proto/did/v1/tx.proto)
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: References
+      description: |
+        Use these documents to help you complete the task.
+      render: markdown
+      value: |
+        - [Cosmos ORM Docs](https://github.com/cosmos/orm)
+        - [DID Document Spec](https://docs.cosmos.network)
+    validations:
+      required: false