diff --git a/.github/ISSUE_TEMPLATE/system-process.md b/.github/ISSUE_TEMPLATE/system-process.md
new file mode 100644
index 000000000..23628ccda
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/system-process.md
@@ -0,0 +1,25 @@
+---
+name: ⚙️ System process
+about: Identify a system process to cover through tests
+title: "[system process] "
+labels: hint/needs-analysis, hint/needs-triage, kind/system-process
+assignees: raulk
+
+---
+
+**Describe the system process.**
+
+<!-- Freeform description/braindump of what the system process does, when is it invoked, what components it interacts with, etc. -->
+
+**Brainstorm test scenarios.**
+
+<!-- Freeform brainstorming of test scenarios. Think about happy paths, natural faults, induced faults (e.g. attacks), stress tests, fuzzying, etc. -->
+
+**Discomfort factor (0-10).**
+
+<!-- How uncomfortable would you be if we launched mainnet without our Oni tests covering this system process / test scenario? --> 
+<!-- Rubric in https://github.com/filecoin-project/oni/labels?q=discomfort. -->
+
+**Additional remarks.**
+
+<!-- Anything else that Project Oni should know. -->
diff --git a/.github/ISSUE_TEMPLATE/test-scenario-request.md b/.github/ISSUE_TEMPLATE/test-scenario-request.md
index 1a69830b0..72419f053 100644
--- a/.github/ISSUE_TEMPLATE/test-scenario-request.md
+++ b/.github/ISSUE_TEMPLATE/test-scenario-request.md
@@ -1,5 +1,5 @@
 ---
-name: Test scenario request
+name: 👯‍♀️ Test scenario request
 about: Suggest a test scenario for Project Oni to consider
 title: "[test request] "
 labels: hint/needs-analysis, hint/needs-triage, kind/test-scenario
@@ -7,25 +7,22 @@ assignees: raulk
 
 ---
 
-**What would you like us to test?**
+**Describe the test scenario.**
 
 <!-- A clear and concise description of what the test scenario looks like, e.g. I'd like you to test that/if/how [...] -->
 
-**Technical implementation details.**
+**Provide any background and technical implementation details.**
 
-<!-- Provide any technical insight that would help us implement such scenario. Think about the setup, choreography between nodes, operations involved, etc. -->
+<!-- Provide any info and technical insight that would help us implement such scenario. Think about the setup, choreography between nodes, operations involved, etc. -->
 
 **What should we measure?**
 
-<!-- Test scenarios are behaviours we orchestrate. In most cases, you'll want measurements captured. What would those be? -->
+<!-- Indicate what we should be measuring for comparison/analytical purposes. -->
 
-**Which components are involved?**
+**Discomfort factor (0-10).**
 
-<!-- Enumerate the Filecoin system components that are involved in this test scenario. Feel free to provide further details. -->
-
-**On a scale from 0-10, what's the proposed _**discomfort factor**_? In other words, how uncomfortable would you be if we went live **without** having tested this? Explain why.**
-
-<!-- 8/10. Because... -->
+<!-- How uncomfortable would you be if we launched mainnet without our Oni tests covering this system process / test scenario? --> 
+<!-- Rubric in https://github.com/filecoin-project/oni/labels?q=discomfort. -->
 
 **Additional remarks.**
 
diff --git a/.github/labels.yml b/.github/labels.yml
index ec7055565..175940aa7 100644
--- a/.github/labels.yml
+++ b/.github/labels.yml
@@ -49,7 +49,7 @@
   color: fcf0b5
   description: "Kind: Improvement"
 - name: kind/test-scenario
-  color: fcf0b5
+  color: feb95e
   description: "Kind: Test Scenario"
 - name: kind/tracking-issue
   color: fcf0b5
@@ -67,7 +67,7 @@
   color: fcf0b5
   description: "Kind: Spike"
 - name: kind/system-process
-  color: fcf0b5
+  color: ff4782
   description: "Kind: System Process"
 
 ###