diff --git a/README.md b/README.md
index 387d2ac05..7698fa86c 100644
--- a/README.md
+++ b/README.md
@@ -20,6 +20,9 @@ https://github.com/petersendev/hassio-addons
 ### [emby](emby/)
 A Free Software Media System that puts you in control of managing and streaming your media.
 
+### [heimdall](heimdall/)
+Application Dashboard
+
 ### [hydra2](hydra2/)
 Meta search application for NZB indexers
 
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 05e30b9bc..250b14bec 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -77,3 +77,6 @@ stages:
             - addon: jellyfin
               jobName: jellyfin
               arch: '--armhf --amd64 --aarch64'
+            - addon: heimdall
+              jobName: heimdall
+              arch: '--armhf --amd64 --aarch64'
diff --git a/heimdall/CHANGELOG.md b/heimdall/CHANGELOG.md
new file mode 100644
index 000000000..dcb057983
--- /dev/null
+++ b/heimdall/CHANGELOG.md
@@ -0,0 +1,3 @@
+## 0.1.0
+
+ - heimdall 2.2.2 (linuxserver/heimdall:2.2.2-ls96)
\ No newline at end of file
diff --git a/heimdall/Dockerfile b/heimdall/Dockerfile
new file mode 100644
index 000000000..c952065c6
--- /dev/null
+++ b/heimdall/Dockerfile
@@ -0,0 +1,30 @@
+ARG BUILD_FROM
+# hadolint ignore=DL3006
+FROM $BUILD_FROM
+
+RUN curl -J -L -o /tmp/bashio.tar.gz \
+        "https://github.com/hassio-addons/bashio/archive/v0.7.1.tar.gz" \
+    && mkdir /tmp/bashio \
+    && tar zxvf \
+        /tmp/bashio.tar.gz \
+        --strip 1 -C /tmp/bashio \
+    \
+    && mv /tmp/bashio/lib /usr/lib/bashio \
+    && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
+    && rm -fr /tmp/* 
+
+# fix folders for hassio environment
+RUN sed -i "s|/config/keys/cert.crt|/ssl/fullchain.pem|g" /defaults/default && \
+    sed -i "s|/config/keys/cert.key|/ssl/privkey.pem|g" /defaults/default && \    
+    sed -i "s|/config|/config/heimdall|g" /defaults/default && \
+    sed -i "s|/config|/config/heimdall|g" /defaults/nginx.conf && \
+    sed -i "s|/config/keys/cert.crt|/ssl/fullchain.pem|g" /etc/cont-init.d/* && \
+    sed -i "s|/config/keys/cert.key|/ssl/privkey.pem|g" /etc/cont-init.d/* && \
+    sed -i "s|/config/heimdall/keys|/ssl|g" /etc/cont-init.d/* && \    
+    sed -i "s|/config|/config/heimdall|g" /etc/cont-init.d/* && \
+    sed -i "s|/config|/config/heimdall|g" /etc/services.d/nginx/* && \
+    sed -i "s|/config|/config/heimdall|g" /etc/logrotate.d/heimdall
+
+
+# copy local files
+COPY root/ /
\ No newline at end of file
diff --git a/heimdall/README.md b/heimdall/README.md
new file mode 100644
index 000000000..818ec763f
--- /dev/null
+++ b/heimdall/README.md
@@ -0,0 +1,26 @@
+# Hassio Add-ons by petersendev: heimdall
+
+## About
+
+[Heimdall](https://heimdall.site/) is a way to organise all those links to your most used web sites and web applications in a simple way. Simplicity is the key to Heimdall. Why not use it as your browser start page? It even has the ability to include a search bar using either Google, Bing or DuckDuckGo.
+
+This addon is based on the [docker image](https://github.com/linuxserver/docker-heimdall) from linuxserver.io.
+
+## Installation
+
+The installation of this add-on is pretty straightforward and not different in
+comparison to installing any other Hass.io add-on.
+
+1. [Add my Hass.io add-ons repository][repository] to your Hass.io instance.
+1. Install this add-on.
+1. Click the `Save` button to store your configuration.
+1. Start the add-on.
+1. Check the logs of the add-on to see if everything went well.
+1. Carefully configure the add-on to your preferences, see the official documentation for for that.
+
+
+## Configuration
+
+Webui can be found at `<your-ip>:82`.
+
+[repository]: https://github.com/petersendev/hassio-addons
\ No newline at end of file
diff --git a/heimdall/build.json b/heimdall/build.json
new file mode 100644
index 000000000..ddb0e38f4
--- /dev/null
+++ b/heimdall/build.json
@@ -0,0 +1,13 @@
+{
+    "build_from_template": {
+        "image": "linuxserver/heimdall",
+        "version": "2.2.2-ls96"
+    },
+    "build_from": {
+        "armhf": "linuxserver/heimdall:arm32v7-2.2.2-ls96",
+        "aarch64": "linuxserver/heimdall:arm64v8-2.2.2-ls96",
+        "amd64": "linuxserver/heimdall:amd64-2.2.2-ls96"
+    },
+    "squash": false,
+    "args": {}
+}
diff --git a/heimdall/config.json b/heimdall/config.json
new file mode 100644
index 000000000..4664c1ea6
--- /dev/null
+++ b/heimdall/config.json
@@ -0,0 +1,45 @@
+{
+  "name": "heimdall",
+  "version": "0.1.0",
+  "slug": "heimdall",
+  "legacy": false,
+  "maintenance": {
+    "github_release": "https://github.com/linuxserver/docker-heimdall",
+    "version_regex": "(\\d+\\.\\d+\\.\\d+)-(ls\\d+)"
+  },
+  "description": "Application Dashboard",
+  "url": "https://github.com/petersendev/hassio-addons/heimdall",
+  "startup": "services",
+  "arch": [
+    "aarch64",
+    "amd64",
+    "armhf"
+  ],
+  "ports": {
+    "80/tcp": 82,
+    "443/tcp": 8445
+  },
+  "ports_description": {
+    "80/tcp": "web interface",
+    "443/tcp": "web interface (SSL)"
+  },
+  "map": [
+    "config:rw",
+    "share:rw",
+    "ssl"
+  ],
+  "webui": "http://[HOST]:[PORT:82]",
+  "boot": "auto",
+  "options": {
+    "PUID": 1001,
+    "PGID": 1001
+  },
+  "schema": {
+    "PUID": "int",
+    "PGID": "int",
+    "TZ": "str?"
+  },
+  "environment": {
+  },
+  "image": "petersendev/hassio-heimdall-{arch}"
+}
diff --git a/heimdall/icon.png b/heimdall/icon.png
new file mode 100644
index 000000000..ed59a9ca2
Binary files /dev/null and b/heimdall/icon.png differ
diff --git a/heimdall/logo.png b/heimdall/logo.png
new file mode 100644
index 000000000..ed59a9ca2
Binary files /dev/null and b/heimdall/logo.png differ
diff --git a/heimdall/root/etc/cont-init.d/00-ha-env b/heimdall/root/etc/cont-init.d/00-ha-env
new file mode 100644
index 000000000..3b3e69246
--- /dev/null
+++ b/heimdall/root/etc/cont-init.d/00-ha-env
@@ -0,0 +1,5 @@
+#!/usr/bin/with-contenv bashio
+
+for k in $(bashio::jq "${__BASHIO_ADDON_CONFIG}" 'keys | .[]'); do
+    printf "$(bashio::config $k)" > /var/run/s6/container_environment/$k
+done
\ No newline at end of file
diff --git a/heimdall/root/etc/cont-init.d/20-folders b/heimdall/root/etc/cont-init.d/20-folders
new file mode 100644
index 000000000..8b2bb6273
--- /dev/null
+++ b/heimdall/root/etc/cont-init.d/20-folders
@@ -0,0 +1,7 @@
+#!/usr/bin/with-contenv bash
+
+if [ ! -d /config/heimdall ]; then
+  echo "Creating /config/heimdall"
+  mkdir -p /config/heimdall
+  chown -R abc:abc /config/heimdall
+fi