diff --git a/.all-contributorsrc b/.all-contributorsrc
new file mode 100644
index 0000000..cf1d969
--- /dev/null
+++ b/.all-contributorsrc
@@ -0,0 +1,24 @@
+{
+  "files": [
+    "CONTRIBUTORS.md"
+  ],
+  "imageSize": 100,
+  "commit": false,
+  "contributors": [
+    {
+      "login": "Alomon31",
+      "name": "Alomon31",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/59569925?v=4",
+      "profile": "https://github.com/Alomon31",
+      "contributions": [
+        "code"
+      ]
+    }
+  ],
+  "contributorsPerLine": 7,
+  "projectName": "OpenMQTTGateway",
+  "projectOwner": "1technophile",
+  "repoType": "github",
+  "repoHost": "https://github.com",
+  "skipCi": true
+}
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 1fe9501..c6c262f 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1,40 +1,22 @@
-  Contributors:
-  - @@1technophile
-  - @crankyoldgit
-  - @glasruit
-  - @HannesDi
-  - @Landrash
-  - @larsenglund
-  - @ChiefZ
-  - @PatteWi
-  - @jumpalottahigh
-  - @zerinrc
-  - @philfifi
-  - @Spudtater
-  - @prahjister
-  - @rickybrent
-  - @petricaM
-  - @ekim from Home assistant forum
-  - @ronvl from Home assistant forum
-  - @Chris Broekema
-  - @Lars Englund
-  - @Fredrik Lindqvist
-  - @Philippe LUC
-  - @Patrick Wilhelm
-  - @Georgi Yanev
-  - @8666
-  - @animavitis
-  - @belidzs
-  - @alibahba
-  - @HosfordDotMe
-  - @torwag
-  - @intractve
-  - @QuagmireMan
-  - @f-reiling
-  - @McGr3g0r
-  - @steadramon
-  - @puuu
-  - @tjhowse
-  - @StryKaizer
-  - @johnou
-  - @posicat
\ No newline at end of file
+<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
+[![All Contributors](https://img.shields.io/badge/all_contributors-1-orange.svg?style=flat-square)](CONTRIBUTORS.md)
+<!-- ALL-CONTRIBUTORS-BADGE:END -->
+
+## Contributors ✨
+
+Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
+
+<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
+<!-- prettier-ignore-start -->
+<!-- markdownlint-disable -->
+<table>
+  <tr>
+    <td align="center"><a href="https://github.com/Alomon31"><img src="https://avatars0.githubusercontent.com/u/59569925?v=4" width="100px;" alt=""/><br /><sub><b>Alomon31</b></sub></a><br /><a href="https://github.com/1technophile/OpenMQTTGateway/commits?author=Alomon31" title="Code">💻</a></td>
+  </tr>
+</table>
+
+<!-- markdownlint-enable -->
+<!-- prettier-ignore-end -->
+<!-- ALL-CONTRIBUTORS-LIST:END -->
+
+This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!
\ No newline at end of file
diff --git a/README.md b/README.md
index fc821a4..bb5778f 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,7 @@
 [![Community forum](https://img.shields.io/badge/community-forum-brightgreen.svg)](https://community.openmqttgateway.com)
+<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
+[![All Contributors](https://img.shields.io/badge/all_contributors-1-orange.svg?style=flat-square)](#contributors-)
+<!-- ALL-CONTRIBUTORS-BADGE:END -->
 [![GitLicense](https://gitlicense.com/badge/1technophile/OpenMQTTGateway)](https://gitlicense.com/license/1technophile/OpenMQTTGateway)
 [![Download count](https://img.shields.io/github/downloads/1technophile/OpenMQTTGateway/total.svg)](https://github.com/1technophile/OpenMQTTGateway/releases)
 
@@ -23,3 +26,22 @@ A list of compatible components to build your gateway is available [here](https:
 If you want to buy a coffee or other beverage so as to give me some support, here is a way to do it : 
 
 <a href="https://www.buymeacoffee.com/1technophile" target="_blank"><img src="https://www.buymeacoffee.com/assets/img/custom_images/orange_img.png" alt="Buy Me A Coffee" style="height: auto !important;width: auto !important;" ></a>
+
+## Contributors ✨
+
+Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
+
+<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
+<!-- prettier-ignore-start -->
+<!-- markdownlint-disable -->
+<table>
+  <tr>
+    <td align="center"><a href="https://github.com/Alomon31"><img src="https://avatars0.githubusercontent.com/u/59569925?v=4" width="100px;" alt=""/><br /><sub><b>Alomon31</b></sub></a><br /><a href="https://github.com/1technophile/OpenMQTTGateway/commits?author=Alomon31" title="Code">💻</a></td>
+  </tr>
+</table>
+
+<!-- markdownlint-enable -->
+<!-- prettier-ignore-end -->
+<!-- ALL-CONTRIBUTORS-LIST:END -->
+
+This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!
\ No newline at end of file