diff --git a/README.md b/README.md
index 2be04be6..b9a5f360 100644
--- a/README.md
+++ b/README.md
@@ -272,6 +272,19 @@ Recorded media, live TV, online news, and podcasts ready to stream.
 
 [:books: Plex Media Server add-on documentation][addon-doc-plex]
 
+### ✓ [Portainer][addon-portainer]
+
+![Latest Version][portainer-version-shield]
+![Supports armhf Architecture][portainer-armhf-shield]
+![Supports aarch64 Architecture][portainer-aarch64-shield]
+![Supports amd64 Architecture][portainer-amd64-shield]
+![Supports i386 Architecture][portainer-i386-shield]
+![Docker Pulls][portainer-pulls-shield]
+
+Manage your Docker environment with ease
+
+[:books: Portainer add-on documentation][addon-doc-portainer]
+
 ### ✓ [SSH & Web Terminal][addon-ssh]
 
 ![Latest Version][ssh-version-shield]
@@ -422,6 +435,7 @@ on the correct GitHub repository matching the add-on.
 - [Open an issue for the add-on: Octobox][octobox-issue]
 - [Open an issue for the add-on: Pi-hole][pi-hole-issue]
 - [Open an issue for the add-on: Plex Media Server][plex-issue]
+- [Open an issue for the add-on: Portainer][portainer-issue]
 - [Open an issue for the add-on: SSH & Web Terminal][ssh-issue]
 - [Open an issue for the add-on: Shinobi Pro][shinobi-issue]
 - [Open an issue for the add-on: Spotify Connect][spotify-issue]
@@ -641,6 +655,15 @@ SOFTWARE.
 [plex-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
 [plex-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
 [plex-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
+[addon-portainer]: https://github.com/hassio-addons/addon-portainer/tree/v0.1.0
+[addon-doc-portainer]: https://github.com/hassio-addons/addon-portainer/blob/v0.1.0/README.md
+[portainer-issue]: https://github.com/hassio-addons/addon-portainer/issues
+[portainer-version-shield]: https://img.shields.io/badge/version-v0.1.0-blue.svg
+[portainer-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/portainer.svg
+[portainer-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
+[portainer-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
+[portainer-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
+[portainer-i386-shield]: https://img.shields.io/badge/i386-no-red.svg
 [addon-ssh]: https://github.com/hassio-addons/addon-ssh/tree/v3.4.1
 [addon-doc-ssh]: https://github.com/hassio-addons/addon-ssh/blob/v3.4.1/README.md
 [ssh-issue]: https://github.com/hassio-addons/addon-ssh/issues
diff --git a/portainer/CHANGELOG.md b/portainer/CHANGELOG.md
new file mode 100644
index 00000000..ccff5b46
--- /dev/null
+++ b/portainer/CHANGELOG.md
@@ -0,0 +1 @@
+Initial release 🎉 
\ No newline at end of file
diff --git a/portainer/README.md b/portainer/README.md
new file mode 100644
index 00000000..522d68a6
--- /dev/null
+++ b/portainer/README.md
@@ -0,0 +1,62 @@
+# Community Hass.io Add-ons: Portainer
+
+[![Release][release-shield]][release] ![Project Stage][project-stage-shield] ![Project Maintenance][maintenance-shield]
+
+[![Discord][discord-shield]][discord] [![Community Forum][forum-shield]][forum]
+
+[![Buy me a coffee][buymeacoffee-shield]][buymeacoffee]
+
+[![Support my work on Patreon][patreon-shield]][patreon]
+
+Manage your Docker environment with ease.
+
+## About
+
+Portainer is an open-source lightweight management UI which allows you to
+easily manage your a Docker host(s) or Docker swarm clusters.
+
+It has never been so easy to manage Docker. Portainer provides a detailed
+overview of Docker and allows you to manage containers, images, networks and
+volumes.
+
+[Click here for the full documentation][docs]
+
+## WARNING
+
+The Portainer add-on is really powerful and gives you virtually access to
+your whole system. While this add-on is created and maintained with care and
+with security in mind, in the wrong or inexperienced hands,
+it could damage your system.
+
+![Portainer screenshot][screenshot]
+
+## WARNING! THIS IS A BETA VERSION!
+
+This Hass.io Add-ons repository contains beta releases of add-ons.
+
+- 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.
+
+If you are more interested in stable releases of our add-ons:
+
+<https://github.com/hassio-addons/repository>
+
+[buymeacoffee-shield]: https://www.buymeacoffee.com/assets/img/guidelines/download-assets-sm-2.svg
+[buymeacoffee]: https://www.buymeacoffee.com/frenck
+[discord-shield]: https://img.shields.io/discord/478094546522079232.svg
+[discord]: https://discord.me/hassioaddons
+[docs]: https://github.com/hassio-addons/addon-portainer/blob/v0.1.0/README.md
+[forum-shield]: https://img.shields.io/badge/community-forum-brightgreen.svg
+[forum]: https://community.home-assistant.io/t/community-hass-io-add-on-portainer/68836?u=frenck
+[maintenance-shield]: https://img.shields.io/maintenance/yes/2018.svg
+[patreon-shield]: https://www.frenck.nl/images/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-v0.1.0-blue.svg
+[release]: https://github.com/hassio-addons/addon-portainer/tree/v0.1.0
+[screenshot]: https://github.com/hassio-addons/addon-portainer/raw/master/images/screenshot.png
\ No newline at end of file
diff --git a/portainer/config.json b/portainer/config.json
new file mode 100644
index 00000000..9622358f
--- /dev/null
+++ b/portainer/config.json
@@ -0,0 +1,43 @@
+{
+  "name": "Portainer",
+  "version": "0.1.0",
+  "slug": "portainer",
+  "description": "Manage your Docker environment with ease",
+  "url": "https://community.home-assistant.io/t/community-hass-io-add-on-portainer/68836?u=frenck",
+  "webui": "[PROTO:ssl]://[HOST]:[PORT:9000]",
+  "startup": "services",
+  "arch": [
+    "aarch64",
+    "amd64",
+    "armhf"
+  ],
+  "map": [
+    "config",
+    "ssl"
+  ],
+  "ports": {
+    "9000/tcp": 9000
+  },
+  "boot": "auto",
+  "hassio_api": true,
+  "docker_api": true,
+  "options": {
+    "log_level": "info",
+    "ssl": true,
+    "certfile": "fullchain.pem",
+    "keyfile": "privkey.pem",
+    "hide_hassio_containers": true
+  },
+  "schema": {
+    "log_level": "match(^(trace|debug|info|notice|warning|error|fatal)$)",
+    "ssl": "bool",
+    "certfile": "str",
+    "keyfile": "str",
+    "hide_hassio_containers": "bool",
+    "leave_front_door_open": "bool?"
+  },
+  "environment": {
+    "LOG_FORMAT": "{LEVEL}: {MESSAGE}"
+  },
+  "image": "hassioaddons/portainer"
+}
\ No newline at end of file
diff --git a/portainer/icon.png b/portainer/icon.png
new file mode 100644
index 00000000..c411cf12
Binary files /dev/null and b/portainer/icon.png differ
diff --git a/portainer/logo.png b/portainer/logo.png
new file mode 100644
index 00000000..e790cc37
Binary files /dev/null and b/portainer/logo.png differ