diff --git a/CONTRIBUTING.md b/.github/contributing.md
similarity index 83%
rename from CONTRIBUTING.md
rename to .github/contributing.md
index 1c4577040..ad6bcb983 100644
--- a/CONTRIBUTING.md
+++ b/.github/contributing.md
@@ -11,13 +11,13 @@ If you have questions about how to install or use Nextcloud, please direct these
   - Go to one of the repositories, click "issues" and type any word in the top search/command bar.
   - You can also filter by appending e. g. "state:open" to the search string.
   - More info on [search syntax within github](https://help.github.com/articles/searching-issues)
-* This repository ([firstrunwizard](https://github.com/nextcloud/firstrunwizard/issues)) is *only* for issues within the ownCloud firstrunwizard code.
-* __SECURITY__: Report any potential security bug to us via [our HackerOne page](https://hackerone.com/nextcloud) or security@nextcloud.com following our [security policy](https://nextcloud.com/security/) instead of filing an issue in our bug tracker.
+* This repository ([First-run wizard](https://github.com/nextcloud/firstrunwizard/issues)) is *only* for issues within the First-run wizard code.
+* __SECURITY__: Report any potential security bug to us via [our HackerOne page](https://hackerone.com/nextcloud) or security@nextcloud.com following our [security policy](https://nextcloud.com/security/) instead of filing an issue in our bug tracker
 * Report the issue using our [template][template], it includes all the information we need to track down the issue.
 
 Help us to maximize the effort we can spend fixing issues and adding new features, by not reporting duplicate issues.
 
-[template]: https://raw.github.com/nextcloud/server/master/issue_template.md
+[template]: https://raw.github.com/nextcloud/firstrunwizard/master/.github/issue_template.md
 [forum]: https://help.nextcloud.com/
 [irc]: https://webchat.freenode.net/?channels=nextcloud
 
diff --git a/.github/issue_template.md b/.github/issue_template.md
new file mode 100644
index 000000000..d9c87052f
--- /dev/null
+++ b/.github/issue_template.md
@@ -0,0 +1,77 @@
+<!--
+Thanks for reporting issues back to Nextcloud! This is the issue tracker of the First-run wizard app, if you have any support question please check out https://help.nextcloud.com/
+
+Find other components at https://github.com/nextcloud/core/blob/master/CONTRIBUTING.md#guidelines
+
+To make it possible for us to help you please fill out below information carefully.
+-->
+### Steps to reproduce
+1.
+2.
+3.
+
+### Expected behaviour
+Tell us what should happen
+
+### Actual behaviour
+Tell us what happens instead
+
+### Server configuration
+<!--
+You can use the Issue Template application to prefill most of the required information: https://apps.nextcloud.com/apps/issuetemplate
+-->
+
+**Operating system**:
+
+**Web server:**
+
+**Database:**
+
+**PHP version:**
+
+**Nextcloud version:** (see Nextcloud admin page)
+
+**Where did you install Nextcloud from:**
+
+
+**List of activated apps:**
+
+```
+If you have access to your command line run e.g.:
+sudo -u www-data php occ app:list
+from within your Nextcloud installation folder
+```
+
+**Nextcloud configuration:**
+
+```
+If you have access to your command line run e.g.:
+sudo -u www-data php occ config:list system
+from within your Nextcloud installation folder
+
+or
+
+Insert your config.php content here
+Make sure to remove all sensitive content such as passwords. (e.g. database password, passwordsalt, secret, smtp password, …)
+```
+
+### Client configuration
+**Browser:**
+
+**Operating system:**
+
+### Logs
+
+#### Nextcloud log (data/owncloud.log)
+```
+Insert your Nextcloud log here
+```
+
+#### Browser log
+```
+Insert your browser log here, this could for example include:
+
+a) The javascript console log
+b) The network log
+c) ...
+```