diff --git a/.github/ISSUE_TEMPLATE/signer_bug.md b/.github/ISSUE_TEMPLATE/signer_bug.md
index 45f1695a0f..f7ef8e7e10 100644
--- a/.github/ISSUE_TEMPLATE/signer_bug.md
+++ b/.github/ISSUE_TEMPLATE/signer_bug.md
@@ -1,25 +1,32 @@
-<!--- Provide a general summary of the issue in the Title above -->
-
-## Expected Behavior
-<!--- Tell us what should happen -->
-
-## Current Behavior
-<!--- Tell us what happens instead of the expected behavior -->
-
-## Steps to Reproduce
-<!--- Provide a link to a live example, or an unambiguous set of steps to -->
-<!--- reproduce this bug. Include code to reproduce, if relevant -->
-1.
-2.
-3.
-4.
-
-## Context (Environment)
-<!--- Provide some information about your environment in order to help address the issue. -->
-
-- <!--- Signer public key -->
-- <!--- Signer version -->
-- <!--- Stacks node version -->
-- <!--- Relevant log messages -->
-- <!--- Tx ID of any transaction you were trying to execute -->
-- <!--- Tx ID of `aggregation-commit-indexed` call in registered cycle (if applicable)<!--- Provide a general summary of the issue in the Title above -->
+---
+name: Signer Bug
+about: Create a report to help us improve the signer
+title: "[SIGNER BUG]"
+labels: signer
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**Steps To Reproduce**
+Please provide detailed instructions (e.g. command line invocation with parameters) to reproduce the behavior.
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Environment (please complete the following information):**
+ - OS: [e.g. Ubuntu / Debian]
+ - Rust version
+ - Version of the appropriate binary / software packages
+ - Signer public key
+ - Relevant log messages
+ - Tx ID of any transaction you were trying to execute 
+ - Tx ID of `aggregation-commit-indexed` call in registered cycle (if applicable)
+
+
+**Additional context**
+Please include any relevant stack traces, error messages and logs.
+
+
diff --git a/.github/ISSUE_TEMPLATE/testnet-bug.md b/.github/ISSUE_TEMPLATE/testnet-bug.md
index 314e8ab237..405deac251 100644
--- a/.github/ISSUE_TEMPLATE/testnet-bug.md
+++ b/.github/ISSUE_TEMPLATE/testnet-bug.md
@@ -3,7 +3,7 @@ name: Testnet Bug
 about: Use this template to submit Stacks 2.0 testnet bugs
 title: "[TESTNET BUG]"
 labels: bug, testnet
-assignees: 'timstackblock'
+assignees: ''
 
 ---