diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index 4732fbaa..00000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,15 +0,0 @@
-* {{ cookiecutter.project_name }} version:
-* Python version:
-* Operating System:
-
-### Description
-
-Describe what you were trying to get done.
-Tell us what happened, what went wrong, and what you expected to happen.
-
-### What I Did
-
-```
-Paste the command(s) you ran and the output.
-If there was a crash, please include the traceback here.
-```
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 00000000..9d3db6fc
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,16 @@
+---
+name: Bug report
+about: You have encountered a bug
+---
+
+## Environment
+
+* Operating System: [FILL HERE]
+* Toolchain (compiler + version): [FILL HERE]
+* Version or commit: [FILL HERE]
+
+## Expected Behaviour
+
+## Actual Behaviour
+
+## Instructions for reproduction
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 00000000..5b75d4dd
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,7 @@
+## Proposed changes
+
+## Contributor checklist
+
+- [ ] My PR is related to \<insert ticket number> 
+- [ ] I have read and understood the [CONTRIBUTING guide](https://github.com/flora-pm/flora-server/blob/development/CONTRIBUTING.md)
+- [ ] I have inserted my change and a link to this PR in the [CHANGELOG](https://github.com/flora-pm/flora-server/blob/development/CHANGELOG.md)
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 00000000..bdb373b8
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,35 @@
+# Conduct
+
+* We are committed to providing a friendly, safe and welcoming environment for all, regardless of level of experience,
+gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age,
+religion, nationality, or other similar characteristic.
+
+* Please avoid using overtly sexual aliases or other nicknames that might detract from a friendly, safe
+and welcoming environment for all.
+
+* Please be kind and courteous. There’s no need to be mean or rude.
+
+* Respect that people have differences of opinion and that every design or implementation choice carries a trade-off
+and numerous costs. There is seldom a right answer.
+
+* Please keep unstructured critique to a minimum. If you have solid ideas you want to experiment with,
+make a fork and see how it works.
+
+* We will exclude you from interaction if you insult, demean or harass anyone. That is not welcome behavior.
+We interpret the term “harassment” as including the definition in the [Citizen Code of Conduct][CCC];
+if you have any lack of clarity about what might be included in that concept, please read their definition.
+In particular, we don’t tolerate behavior that excludes people in socially marginalized groups.
+
+* Private harassment is also unacceptable. No matter who you are, if you feel you have been or are being harassed or
+made uncomfortable by a community member, please contact one of the channel ops or any of the
+[Flora moderation team][Moderation team] immediately. Whether you’re a regular contributor or a newcomer,
+we care about making this community a safe place for you and we’ve got your back.
+
+* Likewise any spamming, trolling, flaming, baiting or other attention-stealing behavior is not welcome.
+
+
+_Adapted from the [Rust Lang][Rust CoC]'s code of conduct_
+
+[CCC]: https://github.com/stumpsyn/policies/blob/master/citizen_code_of_conduct.md
+[Rust CoC]: https://www.rust-lang.org/policies/code-of-conduct
+[Moderation team]: mailto://moderation@flora.pm
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 00000000..99d67cbf
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,32 @@
+Thank you for your contribution to Flora! There is no Contributor License Agreement (CLA) to sign,
+but we need you to read this document when you open your PR or your issue:
+
+## Contributing
+
+We need you to read and acknowledge our [Code of Conduct][CoC] document.
+
+### Pull Requests
+
+You need to
+
+* Read this document
+* Have a ticket that you can relate the PR to, so that we can have some context for your change
+* Provide screenshots of before/after if you change the UI.
+
+### Feature request
+
+Open a thread in the [Feature Request][Feature Request board] discussion board.
+Be certain to search if it has already been suggested!
+
+### Questions 
+
+Open a thread in the [Questions][Questions board] discussion board. You'll get help from everyone in the community.
+
+### Issues & Bugs
+
+Open a [Ticket][Ticket] and tell us what you can about your problem.
+
+[CoC]: https://github.com/flora-pm/flora-server/blob/master/CODE_OF_CONDUCT.md
+[Feature Request board]: https://github.com/flora-pm/flora-server/discussions/new?category=feature-requests
+[Questions board]: https://github.com/flora-pm/flora-server/discussions/categories/questions
+[Ticket]: https://github.com/flora-pm/flora-server/issues/new
diff --git a/src/Data/Aeson/Orphans.hs b/src/Data/Aeson/Orphans.hs
index 905227be..6e2565e5 100644
--- a/src/Data/Aeson/Orphans.hs
+++ b/src/Data/Aeson/Orphans.hs
@@ -3,9 +3,9 @@ module Data.Aeson.Orphans where
 
 import Data.Aeson
 import qualified Data.Text as T
-import qualified Distribution.SPDX.License as SPDX
-import qualified Distribution.Pretty as Pretty
 import Distribution.Parsec (simpleParsec)
+import qualified Distribution.Pretty as Pretty
+import qualified Distribution.SPDX.License as SPDX
 
 instance FromJSON SPDX.License where
   parseJSON = withText "SPDX License" $ \s ->