diff --git a/README.md b/README.md
index 1aa742b1..8b42291e 100644
--- a/README.md
+++ b/README.md
@@ -18,6 +18,7 @@ This is the official repository for the Tipi App Store. It contains all the apps
 - [DokuWiki](https://github.com/dokuwiki/dokuwiki) - DokuWiki is a simple to use and highly versatile Open Source wiki software
 - [Duplicati](https://github.com/linuxserver/docker-duplicati) - Store securely encrypted backups in the cloud!
 - [Emulatorjs](https://github.com/EmulatorJS/EmulatorJS) - Self-hosted Javascript emulation for various system.
+- [Excalidraw](https://github.com/excalidraw/excalidraw) - Online whiteboard collaboration made easy
 - [Filebrowser](https://github.com/filebrowser/filebrowser) - Web File Browser
 - [Firefly III](https://github.com/firefly-iii/firefly-iii) - A personal finances manager
 - [Fireshare](https://github.com/ShaneIsrael/fireshare) - Self host your media and share with unique links
diff --git a/apps/excalidraw/config.json b/apps/excalidraw/config.json
new file mode 100644
index 00000000..1ad319dd
--- /dev/null
+++ b/apps/excalidraw/config.json
@@ -0,0 +1,16 @@
+{
+  "$schema": "../schema.json",
+  "name": "Excalidraw",
+  "port": 8172,
+  "available": true,
+  "exposable": true,
+  "id": "excalidraw",
+  "tipi_version": 1,
+  "version": "latest",
+  "categories": ["utilities"],
+  "description": "Virtual whiteboard for sketching hand-drawn like diagrams",
+  "short_desc": "Online whiteboard collaboration made easy",
+  "author": "Excalidraw",
+  "source": "https://github.com/excalidraw/excalidraw",
+  "form_fields": []
+}
diff --git a/apps/excalidraw/docker-compose.yml b/apps/excalidraw/docker-compose.yml
new file mode 100644
index 00000000..f61a13f4
--- /dev/null
+++ b/apps/excalidraw/docker-compose.yml
@@ -0,0 +1,18 @@
+version: '3.7'
+
+services:
+  excalidraw:
+    container_name: excalidraw
+    image: excalidraw/excalidraw:latest
+    ports:
+      - ${APP_PORT}:80
+    restart: unless-stopped
+    networks:
+      - tipi_main_network
+    labels:
+      traefik.enable: ${APP_EXPOSED}
+      traefik.http.routers.excalidraw.rule: Host(`${APP_DOMAIN}`)
+      traefik.http.routers.excalidraw.entrypoints: websecure
+      traefik.http.routers.excalidraw.service: excalidraw
+      traefik.http.routers.excalidraw.tls.certresolver: myresolver
+      traefik.http.services.excalidraw.loadbalancer.server.port: 80
diff --git a/apps/excalidraw/metadata/description.md b/apps/excalidraw/metadata/description.md
new file mode 100644
index 00000000..47402a18
--- /dev/null
+++ b/apps/excalidraw/metadata/description.md
@@ -0,0 +1,27 @@
+[![Excalidraw](https://camo.githubusercontent.com/4f7c4e56a82975f240dcad5358027bb3be228eac43e420b9e3eb6726925002ac/68747470733a2f2f657863616c69647261772e6e7963332e63646e2e6469676974616c6f6365616e7370616365732e636f6d2f676974687562253246457863616c69647261775f4769746875625f636f7665722e706e67)](https://excalidraw.com/)
+
+#### [](https://github.com/excalidraw/excalidraw?ref=noted#--excalidraw-editor---blog---documentation---excalidraw)[Excalidraw Editor](https://excalidraw.com) | [Blog](https://blog.excalidraw.com) | [Documentation](https://docs.excalidraw.com) | [Excalidraw+](https://plus.excalidraw.com)
+
+## [](https://github.com/excalidraw/excalidraw?ref=noted#----an-open-source-virtual-hand-drawn-style-whiteboard-----collaborative-and-end-to-end-encrypted-----)An open source virtual hand-drawn style whiteboard.  
+Collaborative and end-to-end encrypted.  
+
+Create beautiful hand-drawn like diagrams, wireframes, or whatever you like.
+
+## [](https://github.com/excalidraw/excalidraw?ref=noted#features)Features
+
+The Excalidraw editor (npm package) supports:
+
+-   💯 Free & open-source.
+-   🎨 Infinite, canvas-based whiteboard.
+-   ✍️ Hand-drawn like style.
+-   🌓 Dark mode.
+-   🏗️ Customizable.
+-   📷 Image support.
+-   😀 Shape libraries support.
+-   👅 Localization (i18n) support.
+-   🖼️ Export to PNG, SVG & clipboard.
+-   💾 Open format - export drawings as an `.excalidraw` json file.
+-   ⚒️ Wide range of tools - rectangle, circle, diamond, arrow, line, free-draw, eraser...
+-   ➡️ Arrow-binding & labeled arrows.
+-   🔙 Undo / Redo.
+-   🔍 Zoom and panning support.
\ No newline at end of file
diff --git a/apps/excalidraw/metadata/logo.jpg b/apps/excalidraw/metadata/logo.jpg
new file mode 100644
index 00000000..eb769dc1
Binary files /dev/null and b/apps/excalidraw/metadata/logo.jpg differ