diff --git a/README.md b/README.md
index e8a3ddf5a..cb90c5426 100644
--- a/README.md
+++ b/README.md
@@ -197,6 +197,20 @@ A super-sexy text and voice interface for Plex
 
 [:books: FlexTV add-on documentation][addon-doc-phlex]
 
+### ✓ [Folding@home][addon-foldingathome]
+
+![Latest Version][foldingathome-version-shield]
+![Supports armhf Architecture][foldingathome-armhf-shield]
+![Supports armv7 Architecture][foldingathome-armv7-shield]
+![Supports aarch64 Architecture][foldingathome-aarch64-shield]
+![Supports amd64 Architecture][foldingathome-amd64-shield]
+![Supports i386 Architecture][foldingathome-i386-shield]
+![Docker Pulls][foldingathome-pulls-shield]
+
+Fighting disease with a world wide distributed super computer
+
+[:books: Folding@home add-on documentation][addon-doc-foldingathome]
+
 ### ✓ [Glances][addon-glances]
 
 ![Latest Version][glances-version-shield]
@@ -733,6 +747,7 @@ on the correct GitHub repository matching the add-on.
 - [Open an issue for the add-on: FTP][ftp-issue]
 - [Open an issue for the add-on: Firefly III][firefly-iii-issue]
 - [Open an issue for the add-on: FlexTV][phlex-issue]
+- [Open an issue for the add-on: Folding@home][foldingathome-issue]
 - [Open an issue for the add-on: Glances][glances-issue]
 - [Open an issue for the add-on: Grafana][grafana-issue]
 - [Open an issue for the add-on: Grocy][grocy-issue]
@@ -926,6 +941,16 @@ SOFTWARE.
 [phlex-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
 [phlex-armv7-shield]: https://img.shields.io/badge/armv7-yes-green.svg
 [phlex-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
+[addon-foldingathome]: https://github.com/hassio-addons/addon-foldingathome/tree/72592ef
+[addon-doc-foldingathome]: https://github.com/hassio-addons/addon-foldingathome/blob/72592ef/README.md
+[foldingathome-issue]: https://github.com/hassio-addons/addon-foldingathome/issues
+[foldingathome-version-shield]: https://img.shields.io/badge/version-72592ef-blue.svg
+[foldingathome-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/foldingathome-amd64.svg
+[foldingathome-aarch64-shield]: https://img.shields.io/badge/aarch64-no-red.svg
+[foldingathome-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
+[foldingathome-armhf-shield]: https://img.shields.io/badge/armhf-no-red.svg
+[foldingathome-armv7-shield]: https://img.shields.io/badge/armv7-no-red.svg
+[foldingathome-i386-shield]: https://img.shields.io/badge/i386-no-red.svg
 [addon-glances]: https://github.com/hassio-addons/addon-glances/tree/7cea92a
 [addon-doc-glances]: https://github.com/hassio-addons/addon-glances/blob/7cea92a/README.md
 [glances-issue]: https://github.com/hassio-addons/addon-glances/issues
diff --git a/foldingathome/CHANGELOG.md b/foldingathome/CHANGELOG.md
new file mode 100644
index 000000000..505f4b990
--- /dev/null
+++ b/foldingathome/CHANGELOG.md
@@ -0,0 +1 @@
+- :ambulance: Fix GitLab CI
diff --git a/foldingathome/README.md b/foldingathome/README.md
new file mode 100644
index 000000000..2c5d9e1c2
--- /dev/null
+++ b/foldingathome/README.md
@@ -0,0 +1,64 @@
+# Home Assistant Community Add-on: Folding@home
+
+[![Release][release-shield]][release] ![Project Stage][project-stage-shield] ![Project Maintenance][maintenance-shield]
+
+[![Discord][discord-shield]][discord] [![Community Forum][forum-shield]][forum]
+
+[![Sponsor Frenck via GitHub Sponsors][github-sponsors-shield]][github-sponsors]
+
+[![Support Frenck on Patreon][patreon-shield]][patreon]
+
+Fighting disease with a world wide distributed super computer.
+
+## About
+
+Folding@home (FAH or F@h) is a distributed computing project for performing
+molecular dynamics simulations of protein dynamics. Its initial focus was on
+protein folding but has shifted to more biomedical problems, such as Alzheimer's
+disease, cancer, Ebola and the coronavirus.
+
+The project uses the idle processing resources of personal computers owned by
+volunteers who have installed the software on their systems.
+
+Now you can donate the idle time of your Home Assistant instance to the
+Folding@home project, helping to fight these diseases.
+
+Join the Home Assistant Folding@home team! (id: 247478)
+
+[Click here for the full documentation][docs]
+
+![Folding@home in the Home Assistant Frontend][screenshot]
+
+## WARNING! THIS IS AN EDGE VERSION!
+
+This Home Assistant Add-ons repository contains edge builds of add-ons.
+Edge builds add-ons are based upon the latest development version.
+
+- They may not work at all.
+- They might stop working at any time.
+- They could have a negative impact on your system.
+
+This repository was created for:
+
+- Anybody willing to test.
+- Anybody interested in trying out upcoming add-ons or add-on features.
+- Developers.
+
+If you are more interested in stable releases of our add-ons:
+
+<https://github.com/hassio-addons/repository>
+
+[discord-shield]: https://img.shields.io/discord/478094546522079232.svg
+[discord]: https://discord.me/hassioaddons
+[docs]: https://github.com/hassio-addons/addon-foldingathome/blob/72592ef/README.md
+[forum-shield]: https://img.shields.io/badge/community-forum-brightgreen.svg
+[forum]: https://community.home-assistant.io/t/home-assistant-community-add-on-folding-home/180496?u=frenck
+[github-sponsors-shield]: https://frenck.dev/wp-content/uploads/2019/12/github_sponsor.png
+[github-sponsors]: https://github.com/sponsors/frenck
+[maintenance-shield]: https://img.shields.io/maintenance/yes/2020.svg
+[patreon-shield]: https://frenck.dev/wp-content/uploads/2019/12/patreon.png
+[patreon]: https://www.patreon.com/frenck
+[project-stage-shield]: https://img.shields.io/badge/project%20stage-experimental-yellow.svg
+[release-shield]: https://img.shields.io/badge/version-72592ef-blue.svg
+[release]: https://github.com/hassio-addons/addon-foldingathome/tree/72592ef
+[screenshot]: https://github.com/hassio-addons/addon-foldingathome/raw/master/images/screenshot.png
\ No newline at end of file
diff --git a/foldingathome/config.json b/foldingathome/config.json
new file mode 100644
index 000000000..8ac6ff00f
--- /dev/null
+++ b/foldingathome/config.json
@@ -0,0 +1,30 @@
+{
+  "name": "Folding@home",
+  "version": "72592ef",
+  "slug": "foldingathome",
+  "description": "Fighting disease with a world wide distributed super computer",
+  "url": "https://github.com/hassio-addons/addon-foldingathome",
+  "webui": "http://[HOST]:[PORT:7396]",
+  "startup": "application",
+  "arch": [
+    "amd64"
+  ],
+  "boot": "auto",
+  "init": false,
+  "hassio_api": true,
+  "hassio_role": "default",
+  "options": {},
+  "video": true,
+  "ports": {
+    "7396/tcp": 7396,
+    "36330/tcp": null
+  },
+  "ports_description": {
+    "7396/tcp": "Web interface",
+    "36330/tcp": "Remote command interface"
+  },
+  "schema": {
+    "log_level": "list(trace|debug|info|notice|warning|error|fatal)?"
+  },
+  "image": "hassioaddons/foldingathome-{arch}"
+}
\ No newline at end of file
diff --git a/foldingathome/icon.png b/foldingathome/icon.png
new file mode 100644
index 000000000..368ec9f74
Binary files /dev/null and b/foldingathome/icon.png differ
diff --git a/foldingathome/logo.png b/foldingathome/logo.png
new file mode 100644
index 000000000..09eac7eec
Binary files /dev/null and b/foldingathome/logo.png differ