diff --git a/apps/heimdall/config.json b/apps/heimdall/config.json
new file mode 100644
index 00000000..8b307163
--- /dev/null
+++ b/apps/heimdall/config.json
@@ -0,0 +1,22 @@
+{
+    "name": "Heimdall",
+    "available": true,
+    "exposable": true,
+    "port": 8783,
+    "id": "heimdall",
+    "tipi_version": 1,
+    "version": "2.5.8",
+    "categories": [
+        "utilities"
+    ],
+    "description": "Heimdall is a way to organise all those links to your most used web sites and web applications in a simple way",
+    "short_desc": "Application Dashboard",
+    "author": "linuxserver",
+    "source": "https://github.com/linuxserver/Heimdall",
+    "website": "https://heimdall.site/",
+    "form_fields": [],
+    "supported_architectures": [
+        "arm64", 
+        "amd64"
+    ]
+}
diff --git a/apps/heimdall/docker-compose.yml b/apps/heimdall/docker-compose.yml
new file mode 100644
index 00000000..221820c2
--- /dev/null
+++ b/apps/heimdall/docker-compose.yml
@@ -0,0 +1,42 @@
+version: '3.9'
+
+services:
+  heimdall:
+    image: lscr.io/linuxserver/heimdall:2.5.8
+    container_name: heimdall
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - TZ=${TZ}
+    volumes:
+      - ${APP_DATA_DIR}/data/config:/config
+    ports:
+      - ${APP_PORT}:80
+    restart: unless-stopped
+    networks:
+      - tipi_main_network
+    labels:
+      # Main
+      traefik.enable: true
+      traefik.http.middlewares.heimdall-web-redirect.redirectscheme.scheme: https
+      traefik.http.services.heimdall.loadbalancer.server.port: 3000
+      # Web
+      traefik.http.routers.heimdall-insecure.rule: Host(`${APP_DOMAIN}`)
+      traefik.http.routers.heimdall-insecure.entrypoints: web
+      traefik.http.routers.heimdall-insecure.service: heimdall
+      traefik.http.routers.heimdall-insecure.middlewares: heimdall-web-redirect
+      # Websecure
+      traefik.http.routers.heimdall.rule: Host(`${APP_DOMAIN}`)
+      traefik.http.routers.heimdall.entrypoints: websecure
+      traefik.http.routers.heimdall.service: heimdall
+      traefik.http.routers.heimdall.tls.certresolver: myresolver
+      # Local domain
+      traefik.http.routers.heimdall-local-insecure.rule: Host(`heimdall.${LOCAL_DOMAIN}`)
+      traefik.http.routers.heimdall-local-insecure.entrypoints: web
+      traefik.http.routers.heimdall-local-insecure.service: heimdall
+      traefik.http.routers.heimdall-local-insecure.middlewares: heimdall-web-redirect
+      # Local domain secure
+      traefik.http.routers.heimdall-local.rule: Host(`heimdall.${LOCAL_DOMAIN}`)
+      traefik.http.routers.heimdall-local.entrypoints: websecure
+      traefik.http.routers.heimdall-local.service: heimdall
+      traefik.http.routers.heimdall-local.tls: true
diff --git a/apps/heimdall/metadata/description.md b/apps/heimdall/metadata/description.md
new file mode 100644
index 00000000..86fab798
--- /dev/null
+++ b/apps/heimdall/metadata/description.md
@@ -0,0 +1,7 @@
+## About
+
+As the name suggests Heimdall is a dashboard for all your web applications. It doesn't need to be limited to applications though, you can add links to anything you like.
+
+Heimdall is an elegant solution to organise all your web applications. It’s dedicated to this purpose so you won’t lose your links in a sea of bookmarks.
+
+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.
diff --git a/apps/heimdall/metadata/logo.jpg b/apps/heimdall/metadata/logo.jpg
new file mode 100644
index 00000000..e36ec2ac
Binary files /dev/null and b/apps/heimdall/metadata/logo.jpg differ