diff --git a/CONTRIBUTING.md b/.github/CONTRIBUTING.md
similarity index 97%
rename from CONTRIBUTING.md
rename to .github/CONTRIBUTING.md
index e76ddfddf6..a8d955042d 100644
--- a/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -19,7 +19,7 @@ If you have questions about how to install or use Nextcloud, please direct these
 
 Help us to maximize the effort we can spend fixing issues and adding new features, by not reporting duplicate issues.
 
-[template]: https://raw.githubusercontent.com/nextcloud/server/master/issue_template.md
+[template]: ./ISSUE_TEMPLATE.md
 [forum]: https://help.nextcloud.com/
 [irc]: https://webchat.freenode.net/?channels=nextcloud
 
diff --git a/issue_template.md b/.github/ISSUE_TEMPLATE.md
similarity index 100%
rename from issue_template.md
rename to .github/ISSUE_TEMPLATE.md
diff --git a/README.md b/README.md
index d131b34f47..313c1bf84d 100644
--- a/README.md
+++ b/README.md
@@ -61,7 +61,7 @@ changed it substantially:
 
 Please read the [Code of Conduct](https://nextcloud.com/community/code-of-conduct/). This document offers some guidance to ensure Nextcloud participants can cooperate effectively in a positive and inspiring atmosphere, and to explain how together we can strengthen and support each other.
 
-Please review the [guidelines for contributing](https://github.com/nextcloud/server/blob/master/CONTRIBUTING.md) to this repository.
+Please review the [guidelines for contributing](.github/CONTRIBUTING.md) to this repository.
 
 More information how to contribute: [https://nextcloud.com/contribute/](https://nextcloud.com/contribute/)
 
diff --git a/build/files-checker.php b/build/files-checker.php
index ba9761fe4d..4b694a1ccf 100644
--- a/build/files-checker.php
+++ b/build/files-checker.php
@@ -53,14 +53,12 @@ $expectedFiles = [
 	'config',
 	'console.php',
 	'contribute',
-	'CONTRIBUTING.md',
 	'COPYING',
 	'COPYING-README',
 	'core',
 	'cron.php',
 	'index.html',
 	'index.php',
-	'issue_template.md',
 	'lib',
 	'occ',
 	'ocs',
diff --git a/contribute/HowToApplyALicense.md b/contribute/HowToApplyALicense.md
index 3ed231a6c1..ecc1cffcea 100644
--- a/contribute/HowToApplyALicense.md
+++ b/contribute/HowToApplyALicense.md
@@ -43,4 +43,4 @@ If you create a new file please use this license header:
 Additionally we require a Developer Certificate of Origin (DCO), look
 at [CONTRIBUTING.md][contributing] to learn more how to sign your commits.
 
-[contributing]: https://github.com/nextcloud/server/blob/master/CONTRIBUTING.md#sign-your-work
+[contributing]: ../.github/CONTRIBUTING.md#sign-your-work