diff --git a/CONTRIBUTING.md b/.github/CONTRIBUTING.md
old mode 100755
new mode 100644
similarity index 100%
rename from CONTRIBUTING.md
rename to .github/CONTRIBUTING.md
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 00000000..06a27441
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,23 @@
+<!--
+
+Are you using a third party tool (e.g. clairctl, klar)?
+If so, please open issues with them first.
+
+-->
+
+**Description of Problem**:
+
+
+**Expected Outcome**:
+
+
+**Actual Outcome**:
+
+
+**Environment**:
+- Clair version/image:
+- Host OS:
+- Kernel (e.g. `uname -a`):
+- Kubernetes version (use `kubectl version`):
+- Helm version (use `helm version`):
+- Network/Firewall setup: