diff --git a/.github/ISSUE_TEMPLATE/binary---bug-report.md b/.github/ISSUE_TEMPLATE/binary---bug-report.md
new file mode 100644
index 00000000..80c9e4cb
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/binary---bug-report.md
@@ -0,0 +1,31 @@
+---
+name: Binary - Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. macOS, Linux]
+ - Source [e.g. CCP4, GitHub]
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/binary---feature-request.md b/.github/ISSUE_TEMPLATE/binary---feature-request.md
new file mode 100644
index 00000000..94b42bb4
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/binary---feature-request.md
@@ -0,0 +1,20 @@
+---
+name: Binary - Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/web-app----feature-request.md b/.github/ISSUE_TEMPLATE/web-app----feature-request.md
index cc290a1a..fa2289ea 100644
--- a/.github/ISSUE_TEMPLATE/web-app----feature-request.md
+++ b/.github/ISSUE_TEMPLATE/web-app----feature-request.md
@@ -2,7 +2,7 @@
 name: Web App  - Feature request
 about: Suggest an idea for this project
 title: ''
-labels: webserver
+labels: enhancement, webserver
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/web-app---bug-report.md b/.github/ISSUE_TEMPLATE/web-app---bug-report.md
new file mode 100644
index 00000000..546c2907
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/web-app---bug-report.md
@@ -0,0 +1,38 @@
+---
+name: Web App - Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug, webserver
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. macOS, Linux, Windows]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.