diff --git a/.github/ISSUE_TEMPLATE/add-or-update-provider.md b/.github/ISSUE_TEMPLATE/add-or-update-provider.md
new file mode 100644
index 000000000..5b6ac4998
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/add-or-update-provider.md
@@ -0,0 +1,14 @@
+---
+name: Add or update provider
+about: Request for a new provider or update configs for an existing provider.
+title: ''
+labels: provider
+assignees: ''
+
+---
+
+**Which provider?**
+<!-- Name the provider you want updated -->
+
+**Where are the configs?**
+<!-- Most providers supply a .zip file containing all configs and certificates. Please provide a link to the .ovpn config bundle -->
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 000000000..344238dda
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,28 @@
+---
+name: Bug report
+about: Container is not behaving as expected
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!-- 
+Thanks for filing an issue! Before hitting the button, please answer these questions. It's helpful to search the existing GitHub issues first. It's likely that another user has already reported the issue you're facing, or it's a known issue that we're already aware of.
+
+Also. If you don't suspect that there are any issues with the image itself, but that you have issues configuring it - please read the README twice and try the gitter chat before posting here.
+-->
+
+**Describe the problem**
+<!-- A clear and concise description of what the bug is. -->
+
+**Add your docker run command**
+<!-- To understand how your container is running, provide the docker run command or the docker-compose.yml file you used to start it. If you're using a GUI to set up the container then provide screenshots or a list of options and settings. -->
+
+**Logs**
+<!-- Provide all logs from the container. By default the should not be any sensitive information there, but if there is then mask it with *** or something similar.
+You can get the logs by running "docker logs <container-name>". -->
+
+**Host system:**
+<!-- Are you running on Ubuntu, a NAS, Raspberry Pi, Mac OS or something else?
+Which version of Docker are you using? -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 000000000..6315abc65
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: 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. -->