diff --git a/CONTRIBUTING.MD b/CONTRIBUTING.MD
new file mode 100644
index 0000000..e1b02ec
--- /dev/null
+++ b/CONTRIBUTING.MD
@@ -0,0 +1,198 @@
+# Contributing
+
+We welcome contributions in several forms, e.g.
+
+- Improve end user documenting on the [README](https://github.com/Samagra-Development/oauth2-fa-proxy/blob/main/README.md)
+
+- Write unit tests and learn how the code works
+
+- Verify available [patches (pull requests)](https://github.com/Samagra-Development/oauth2-fa-proxy/pulls)
+
+- Working on [issues](https://github.com/Samagra-Development/oauth2-fa-proxy/issues)
+
+  - Fix a bug
+  - Add a new feature
+
+- etc.
+
+## Reporting Bugs
+
+OAuth-fa-proxy uses GitHub's issue tracker. All bugs and enhancements should be
+entered so that we don't lose track of them, can prioritize, assign, and so code
+fixes can refer to the bug number in its check-in comments.
+
+The issue usually contains much more detail (including test cases) than can be
+reasonably put in check-in comments, so being able to correlate the two is
+important.
+
+Consider the usual best practice for writing issues, among them:
+
+- More verbosity rather than one liners
+- Screenshots are a great help
+- Providing example files (in case for example scanning crashes)
+- Please determine the version, better the commit id
+- Details on the operating system you are using
+
+## Git Guidelines
+
+Not familiar with git, see [Git basic commands](https://git-scm.com/)
+
+### Workflow
+
+We are using the [Feature Branch Workflow (also known as GitHub Flow)](https://guides.github.com/introduction/flow/),
+and prefer delivery as pull requests.
+
+Create a feature branch:
+
+```sh
+git checkout -B feat/tune-vagrant-vm
+```
+
+### Git Commit
+
+The cardinal rule for creating good commits is to ensure there is only one
+"logical change" per commit. Why is this an important rule?
+
+- The smaller the amount of code being changed, the quicker & easier it is to
+  review & identify potential flaws.
+
+- If a change is found to be flawed later, it may be necessary to revert the
+  broken commit. This is much easier to do if there are no other unrelated
+  code changes entangled with the original commit.
+
+- When troubleshooting problems using Git's bisect capability, small well
+  defined changes will aid in isolating exactly where the code problem was
+  introduced.
+
+- When browsing history using Git annotate/blame, small well defined changes
+  also aid in isolating exactly where & why a piece of code came from.
+
+Things to avoid when creating commits
+
+- Mixing whitespace changes with functional code changes.
+- Mixing two unrelated functional changes.
+- Sending large new features in a single giant commit.
+
+### Git Commit Conventions
+
+We use git commit as per [Conventional Changelog](https://www.conventionalcommits.org/en/v1.0.0/):
+
+```none
+<type>(<scope>): <subject>
+```
+
+Example:
+
+```none
+feat(vagrant): increase upload size
+```
+
+Allowed types:
+
+- **feat**: A new feature
+- **fix**: A bug fix
+- **docs**: Documentation only changes
+- **style**: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, newline, line endings, etc)
+- **refactor**: A code change that neither fixes a bug or adds a feature
+- **perf**: A code change that improves performance
+- **test**: Adding missing tests
+- **chore**: Changes to the build process or auxiliary tools and libraries such as documentation generation
+
+You can add additional details after a new line to describe the change in detail or automatically close an issue on Github.
+
+```none
+feat(CONTRIBUTING.md): create initial CONTRIBUTING.md
+
+This closes #22
+```
+
+### Developer Certificate of Origin (DCO)
+
+All commits not submitted via GitHub pull request shall contain a
+Signed-off-by line, also known as the **Developer Certificate of Origin (DCO)**
+as we know it from the Linux Kernel [Documenation/SubmittingPatches](https://www.kernel.org/doc/Documentation/process/submitting-patches.rst)
+
+```none
+    Signed-off-by: Peace Fun Ingenium <peacefun.ingenium@example.com>
+```
+
+Additional tags in addition to Signed-off-by shall be used as long as it makes
+sense for any commit, e.g.
+
+```none
+    Reviewed-by:
+    Tested-by:
+    Reviewed-by:
+    Suggested-by:
+    Acked-by:
+    Sponsored-by:
+```
+
+## Pull requests
+
+Pull requests with patches, improvements, new features are a great help.
+Please keep them clean from unwanted commits.
+
+Follow the steps to get your work included in the project.
+
+1. [Fork](https://help.github.com/fork-a-repo/) the project, clone your fork,
+   and add the oauth-fa-proxy remote:
+
+   ```bash
+   # Clone your fork of the repo into the current directory
+   git clone https://github.com/<your-username>/oauth2-fa-proxy.git
+   # Navigate to the cloned directory
+   cd oauth2-fa-proxy
+   # Assign the original repo to a remote called "upstream"
+   git remote add upstream https://github.com/Samagra-Development/oauth2-fa-proxy.git
+   ```
+
+2. Get the latest changes from upstream:
+
+   ```bash
+   git checkout master
+   git pull upstream master
+   ```
+
+3. Create a new branch from the master branch to contain your changes.
+   Best way is to call is to follow the type described in **Git Commit Conventions**
+   stated above: `<githubId>/#<issueNr>/<description/scope/topic>`
+
+   ```bash
+   git checkout -b <topic-branch-name>
+   ```
+
+   Example:
+
+   ```bash
+   git checkout -b john/138/buckets-undefined-index
+   ```
+
+   Or
+
+   ```bash
+   git checkout -b john/fix/138
+   ```
+
+4) It's coding time!
+   Commit your changes in logical chunks. Please adhere to **Git Commit Conventions**
+   and [Coding guidelines](https://github.com/Samagra-Development/oauth2-fa-proxy/blob/main/README.md)
+   
+   or your code is unlikely to be merged into the main project.
+   Use Git's [interactive rebase](https://www.atlassian.com/git/tutorials/rewriting-history/git-rebase)
+   feature to tidy up your commits before making them public.
+
+5) Locally rebase the upstream master branch into your topic branch:
+
+   ```bash
+   git pull --rebase upstream master
+   ```
+
+6) Push your topic branch up to your fork:
+
+   ```bash
+   git push origin <topic-branch-name>
+   ```
+
+7) [Open a Pull Request](https://help.github.com/articles/using-pull-requests/)
+   with a clear title and description against the `master` branch.
\ No newline at end of file
diff --git a/README.md b/README.md
index eb4e2a9..adbf58a 100644
--- a/README.md
+++ b/README.md
@@ -24,3 +24,6 @@ Copy the `sample.env` and rename it as `.env`
 chmod +x install.sh
 sudo ./install.sh
 ```
+## Contributing
+
+We really like contributions in several forms, see [CONTRIBUTING.md](CONTRIBUTING.md)
\ No newline at end of file