diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000..9525bbe
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,13 @@
+### Describe the issue you are having
+<!-- replace this with your issue description -->
+
+### Describe your setup?
+<!-- What is your dns server, are you using steamcache/dns or another resolver -->
+
+### Are you running sniproxy
+<!-- Yes/no -->
+
+### DNS Configuration
+```
+<!-- Paste either your docker run command for the DNS container OR explain how you have setup DNS zone files etc -->
+```
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000..3cdd03c
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,17 @@
+### What CDN does this PR relate to
+<!-- Please clearly state what existing cdn this pr relates to, or which games if it's a new cdn -->
+
+### Does this require running via sniproxy
+<!-- Yes/no/untested -->
+
+### Capture method
+<!-- Please give a short description how you ascertained the updates to the domain files, wireshark, dns logs etc -->
+
+### Testing Scenario
+<!-- Please give a short description on how you have tested this and where (home, office, small lan, large lan etc) -->
+
+### Testing Configuration
+```
+<!-- Paste either your docker run command from the DNS container OR explain how you have setup DNS zone files etc to test this issue -->
+```
+