diff --git a/README.md b/README.md
index e5d376cc..37854fbb 100644
--- a/README.md
+++ b/README.md
@@ -29,6 +29,7 @@ This is the official repository for the Tipi App Store. It contains all the apps
 - [Deemix](https://gitlab.com/Bockiii/deemix-docker) - deemix is a barebone deezer downloader library built from the ashes of Deezloader Remix.
 - [DokuWiki](https://github.com/dokuwiki/dokuwiki) - DokuWiki is a simple to use and highly versatile Open Source wiki software
 - [Dozzle](https://github.com/amir20/dozzle) - Dozzle is a small web based app to monitor Docker logs
+- [Draw.io](https://github.com/jgraph/drawio) - draw.io is a JavaScript, client-side editor for general diagramming and whiteboarding.
 - [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
diff --git a/apps/drawio/config.json b/apps/drawio/config.json
new file mode 100644
index 00000000..2e59a369
--- /dev/null
+++ b/apps/drawio/config.json
@@ -0,0 +1,17 @@
+{
+    "name": "Draw.io",
+    "available": true,
+    "port": 8734,
+    "exposable": true, 
+    "id": "drawio", 
+    "description": "draw.io is a JavaScript, client-side editor for general diagramming and whiteboarding.", 
+    "tipi_version": 1, 
+    "version": "22.0.6", 
+    "categories": ["utilities"], 
+    "short_desc": "Diagramming and whiteboarding app.", 
+    "author": "JGraph", 
+    "source": "https://github.com/jgraph/drawio", 
+    "website": "https://www.drawio.com/", 
+    "form_fields": [],
+    "supported_architectures": ["arm64", "amd64"] 
+}
\ No newline at end of file
diff --git a/apps/drawio/docker-compose.yml b/apps/drawio/docker-compose.yml
new file mode 100644
index 00000000..a4baa73b
--- /dev/null
+++ b/apps/drawio/docker-compose.yml
@@ -0,0 +1,36 @@
+version: "3.7"
+services:
+  drawio:
+    image: jgraph/drawio:22.0.6
+    ports:
+      - ${APP_PORT}:8080
+    container_name: drawio
+    tty: true
+    stdin_open: true
+    networks:
+      - tipi_main_network
+    labels:
+      # Main
+      traefik.enable: true
+      traefik.http.middlewares.drawio-web-redirect.redirectscheme.scheme: https
+      traefik.http.services.drawio.loadbalancer.server.port: 8080
+      # Web
+      traefik.http.routers.drawio-insecure.rule: Host(`${APP_DOMAIN}`)
+      traefik.http.routers.drawio-insecure.entrypoints: web
+      traefik.http.routers.drawio-insecure.service: drawio
+      traefik.http.routers.drawio-insecure.middlewares: drawio-web-redirect
+      # Websecure
+      traefik.http.routers.drawio.rule: Host(`${APP_DOMAIN}`)
+      traefik.http.routers.drawio.entrypoints: websecure
+      traefik.http.routers.drawio.service: drawio
+      traefik.http.routers.drawio.tls.certresolver: myresolver
+      # Local domain
+      traefik.http.routers.drawio-local-insecure.rule: Host(`drawio.${LOCAL_DOMAIN}`)
+      traefik.http.routers.drawio-local-insecure.entrypoints: web
+      traefik.http.routers.drawio-local-insecure.service: drawio
+      traefik.http.routers.drawio-local-insecure.middlewares: drawio-web-redirect
+      # Local domain secure
+      traefik.http.routers.drawio-local.rule: Host(`drawio.${LOCAL_DOMAIN}`)
+      traefik.http.routers.drawio-local.entrypoints: websecure
+      traefik.http.routers.drawio-local.service: drawio
+      traefik.http.routers.drawio-local.tls: true
diff --git a/apps/drawio/metadata/description.md b/apps/drawio/metadata/description.md
new file mode 100644
index 00000000..543a0277
--- /dev/null
+++ b/apps/drawio/metadata/description.md
@@ -0,0 +1,7 @@
+## Draw.io
+
+**Warning:** when openning the draw.io page add an ``?offline=1`` in the end else you will get ``Failed to execute 'open' on 'XMLHttpRequest': Invalid URL`` error!
+
+draw.io, this project, is a configurable diagramming/whiteboarding visualization application. draw.io is jointly owned and developed by JGraph Ltd and draw.io AG.
+
+As well as running this project, we run a production-grade deployment of the diagramming interface at [https://app.diagrams.net](https://app.diagrams.net).
diff --git a/apps/drawio/metadata/logo.jpg b/apps/drawio/metadata/logo.jpg
new file mode 100644
index 00000000..4425f506
Binary files /dev/null and b/apps/drawio/metadata/logo.jpg differ