diff --git a/README.md b/README.md
index 2fd6d286..87c2361d 100644
--- a/README.md
+++ b/README.md
@@ -41,6 +41,7 @@ This is the official repository for the Tipi App Store. It contains all the apps
 - [Ghostfolio](https://github.com/ghostfolio/ghostfolio) - Open Source Wealth Management Software.
 - [Gitea](https://github.com/go-gitea/gitea) - Gitea - A painless self-hosted Git service
 - [Gladys Assistant](https://github.com/gladysassistant/gladys) - A privacy-first, open-source home assistant
+- [Glances](https://github.com/nicolargo/glances) - Glances - An Eye on your system.
 - [Gotify](https://github.com/gotify/server) - Gotify - Simple server for sending and receiving notification messages
 - [GoToSocial](https://github.com/superseriousbusiness/gotosocial) - Fast, fun, ActivityPub server, powered by Go.
 - [Grafana](https://github.com/grafana/grafana) - The open and composable observability and data visualization platform
diff --git a/apps/glances/config.json b/apps/glances/config.json
new file mode 100644
index 00000000..07fcea72
--- /dev/null
+++ b/apps/glances/config.json
@@ -0,0 +1,19 @@
+{
+  "$schema": "../schema.json",
+  "name": "Glances",
+  "port": 8420,
+  "available": true,
+  "exposable": false,
+  "id": "glances",
+  "tipi_version": 1,
+  "version": "3.4.0.3-full",
+  "categories": [
+    "utilities"
+  ],
+  "description": "Glances is an open-source system cross-platform monitoring tool. It allows real-time monitoring of various aspects of your system such as CPU, memory, disk, network usage etc.",
+  "short_desc": "An eye on your system",
+  "author": "nicolargo",
+  "source": "https://github.com/nicolargo/glances",
+  "website": "https://nicolargo.github.io/glances/",
+  "form_fields": []
+}
diff --git a/apps/glances/docker-compose.yml b/apps/glances/docker-compose.yml
new file mode 100644
index 00000000..d1ba57f4
--- /dev/null
+++ b/apps/glances/docker-compose.yml
@@ -0,0 +1,31 @@
+version: "3.7"
+services:
+    glances:
+        container_name: glances
+        restart: unless-stopped
+        ports:
+            - ${APP_PORT}:61208
+        environment:
+            - TZ=${TZ}
+            - GLANCES_OPT=-w
+        volumes:
+            - /var/run/docker.sock:/var/run/docker.sock:ro
+        pid: host
+        image: nicolargo/glances:3.4.0.3-full
+        networks:
+            - tipi_main_network
+        labels:
+            # Main
+            traefik.enable: true
+            traefik.http.middlewares.glances-web-redirect.redirectscheme.scheme: https
+            traefik.http.services.glances.loadbalancer.server.port: 61208
+            # Local domain
+            traefik.http.routers.glances-local-insecure.rule: Host(`glances.${LOCAL_DOMAIN}`)
+            traefik.http.routers.glances-local-insecure.entrypoints: web
+            traefik.http.routers.glances-local-insecure.service: glances
+            traefik.http.routers.glances-local-insecure.middlewares: glances-web-redirect
+            # Local domain secure
+            traefik.http.routers.glances-local.rule: Host(`glances.${LOCAL_DOMAIN}`)
+            traefik.http.routers.glances-local.entrypoints: websecure
+            traefik.http.routers.glances-local.service: glances
+            traefik.http.routers.glances-local.tls: true
diff --git a/apps/glances/metadata/description.md b/apps/glances/metadata/description.md
new file mode 100644
index 00000000..dc09a9bf
--- /dev/null
+++ b/apps/glances/metadata/description.md
@@ -0,0 +1,3 @@
+**Glances** is an open-source system cross-platform monitoring tool. It allows real-time monitoring of various aspects of your system such as CPU, memory, disk, network usage etc. It also allows monitoring of running processes, logged in users, temperatures, voltages, fan speeds etc. It also supports container monitoring, it supports different container management systems such as Docker, LXC. The information is presented in an easy to read dashboard and can also be used for remote monitoring of systems via a web interface or command line interface. It is easy to install and use and can be customized to show only the information that you are interested in.
+
+![Screenshot](https://raw.githubusercontent.com/nicolargo/glances/develop/docs/_static/glances-summary.png)
\ No newline at end of file
diff --git a/apps/glances/metadata/logo.jpg b/apps/glances/metadata/logo.jpg
new file mode 100644
index 00000000..c73a134b
Binary files /dev/null and b/apps/glances/metadata/logo.jpg differ
diff --git a/apps/qdirstat/config.json b/apps/qdirstat/config.json
new file mode 100644
index 00000000..b421820c
--- /dev/null
+++ b/apps/qdirstat/config.json
@@ -0,0 +1,18 @@
+{
+  "$schema": "../schema.json",
+  "name": "qDirStat",
+  "port": 7125,
+  "available": true,
+  "exposable": true,
+  "id": "qdirstat",
+  "tipi_version": 1,
+  "version": "1.8.1-ls82",
+  "categories": [
+    "Utilities"
+  ],
+  "description": "QDirStat Qt-based directory statistics: KDirStat without any KDE -- from the author of the original KDirStat.",
+  "short_desc": "A graphical disk usage analyzer",
+  "author": "Stefan Hundhammer",
+  "source": "https://github.com/linuxserver/docker-qdirstat",
+  "form_fields": []
+}
diff --git a/apps/qdirstat/docker-compose.yml b/apps/qdirstat/docker-compose.yml
new file mode 100644
index 00000000..2c0c40f3
--- /dev/null
+++ b/apps/qdirstat/docker-compose.yml
@@ -0,0 +1,39 @@
+version: "1.8.1-ls82"
+services:
+    qdirstat:
+        container_name: qdirstat
+        restart: unless-stopped
+        ports:
+            - ${APP_PORT}:3000
+        volumes:
+            - ${APP_DATA_DIR}/data/qdirstat/config
+            - ${APP_DATA_DIR}/data/qdirstat/app/data
+            - /:/host:ro
+        image: lscr.io/linuxserver/qdirstat:1.8.1-ls82
+        networks:
+            - tipi_main_network
+        labels:
+            # Main
+            traefik.enable: true
+            traefik.http.middlewares.qdirstat-web-redirect.redirectscheme.scheme: https
+            traefik.http.services.qdirstat.loadbalancer.server.port: 8080
+            # Web
+            traefik.http.routers.qdirstat-insecure.rule: Host(`${APP_DOMAIN}`)
+            traefik.http.routers.qdirstat-insecure.entrypoints: web
+            traefik.http.routers.qdirstat-insecure.service: qdirstat
+            traefik.http.routers.qdirstat-insecure.middlewares: qdirstat-web-redirect
+            # Websecure
+            traefik.http.routers.qdirstat.rule: Host(`${APP_DOMAIN}`)
+            traefik.http.routers.qdirstat.entrypoints: websecure
+            traefik.http.routers.qdirstat.service: qdirstat
+            traefik.http.routers.qdirstat.tls.certresolver: myresolver
+            # Local domain
+            traefik.http.routers.qdirstat-local-insecure.rule: Host(`qdirstat.${LOCAL_DOMAIN}`)
+            traefik.http.routers.qdirstat-local-insecure.entrypoints: web
+            traefik.http.routers.qdirstat-local-insecure.service: qdirstat
+            traefik.http.routers.qdirstat-local-insecure.middlewares: qdirstat-web-redirect
+            # Local domain secure
+            traefik.http.routers.qdirstat-local.rule: Host(`qdirstat.${LOCAL_DOMAIN}`)
+            traefik.http.routers.qdirstat-local.entrypoints: websecure
+            traefik.http.routers.qdirstat-local.service: qdirstat
+            traefik.http.routers.qdirstat-local.tls: true
diff --git a/apps/qdirstat/metadata/description.md b/apps/qdirstat/metadata/description.md
new file mode 100644
index 00000000..b4ce0807
--- /dev/null
+++ b/apps/qdirstat/metadata/description.md
@@ -0,0 +1,44 @@
+# QDirStat
+
+QDirStat is a graphical application to show where your disk space has gone and
+to help you to clean it up.
+
+This is a Qt-only port of the old Qt3/KDE3-based KDirStat, now based on the
+latest Qt 5. It does not need any KDE libs or infrastructure. It runs on every
+X11-based desktop on Linux, BSD and other Unix-like systems and of course in a
+Docker container.
+
+![Screenshot](https://github.com/shundhammer/qdirstat/raw/master/screenshots/QDirStat-main-win.png)
+
+_Main window screenshot - notice the multi-selection in the tree and the treemap_
+
+## Features
+
+QDirStat has a number of new features compared to KDirStat. To name a few:
+
+- Multi-selection in both the tree and the treemap.
+
+- Unlimited number of user-defined cleanup actions.
+
+- Properly show errors of cleanup actions (and their output, if desired).
+
+- Configurable file categories (MIME types), treemap colors, exclude rules,
+  tree columns.
+
+- Package manager support:
+  - Show what software package a system file belongs to.
+  - **Packages View** showing disk usage of installed software
+    packages and their individual files.
+  - **Unpacked Files View** showing what files in system directories do not belong to any installed software package.
+
+- New views:
+  - Disk usage per file type (by filename extension).
+  - File size histogram view.
+  - File age view.
+  - Free, used and reserved disk size for each mounted filesystem (like _df_)
+  
+  ---
+
+  # Tipi Specific Note
+
+  By default, qDirStat will analyze the /runtipi/ directory, *not the whole system that tipi is installed on!*
\ No newline at end of file
diff --git a/apps/qdirstat/metadata/logo.jpg b/apps/qdirstat/metadata/logo.jpg
new file mode 100644
index 00000000..a8331f64
Binary files /dev/null and b/apps/qdirstat/metadata/logo.jpg differ