diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..220d420
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,39 @@
+---
+name: Bug Report
+about: Report a bug
+labels: bug
+---
+
+## Search terms
+
+<!-- Include keywords that might help others with the same problem find this issue -->
+
+## Environment
+
+-   HL7 Client version:
+-   TypeScript version:
+-   Node.js version:
+-   OS:
+
+Questions:
+
+- Are you using the Node [HL7 Server](https://github.com/Bugs5382/node-hl7-server) package as your HL7 Server to connect to or a 3rd party system?
+
+## Expected Behavior
+
+<!-- How did you expect HL7 Client to work? -->
+
+## Actual Behavior
+
+<!-- What does HL7 Client fail to do? -->
+
+## Steps to reproduce the bug
+
+<!--
+
+Please provide the code causing the issue, as comprehensively as possible. 
+If the issue is related to a specific HL7 message, please include the actual
+message you sent. Ensure that any sensitive information is scrubbed and sanitized before sharing.
+
+-->
+
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
new file mode 100644
index 0000000..bda961c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -0,0 +1,11 @@
+---
+name: Question
+about: Ask a question
+labels: question
+---
+
+## Search terms
+
+<!-- Include keywords that might help others with the same question find this issue -->
+
+## Question
\ No newline at end of file