diff --git a/README.md b/README.md
index 4bc43a42..ed4ff97c 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,7 @@ This is the official repository for the Tipi App Store. It contains all the apps
 - [Ghost](https://github.com/TryGhost/Ghost) - Ghost - Turn your audience into a business
 - [Gitea](https://github.com/go-gitea/gitea) - Gitea - A painless self-hosted Git service
 - [Gotify](https://github.com/gotify/server) - Gotify - Simple server for sending and receiving notification messages
+- [Grav](https://github.com/getgrav/grav) - Fast, Simple, and Flexible, file-based Web-platform. 
 - [Grocy](https://github.com/grocy/grocy) - Grocy - ERP beyond your fridge
 - [Haven](https://github.com/havenweb/haven) - Haven is a self-hosted private blog and feedreader you can use instead of Facebook
 - [Headscale](https://github.com/juanfont/headscale) - An open source, self-hosted implementation of the Tailscale control server
diff --git a/apps/grav/config.json b/apps/grav/config.json
new file mode 100644
index 00000000..b5409e65
--- /dev/null
+++ b/apps/grav/config.json
@@ -0,0 +1,16 @@
+{
+  "$schema": "../schema.json",
+  "name": "Grav",
+  "port": 8161,
+  "available": true,
+  "exposable": true,
+  "id": "grav",
+  "tipi_version": 1,
+  "version": "1.7.39.4-ls97",
+  "categories": ["social", "media"],
+  "description": "Grav is a Fast, Simple, and Flexible, file-based Web-platform. There is Zero installation required. It follows similar principles to other flat-file CMS platforms, but has a different design philosophy than most. Grav comes with a powerful Package Management System to allow for simple installation and upgrading of plugins and themes, as well as simple updating of Grav itself.",
+  "short_desc": "Grav is a Fast, Simple, and Flexible, file-based Web-platform. ",
+  "author": "Grav",
+  "source": "https://github.com/getgrav/grav",
+  "form_fields": []
+}
diff --git a/apps/grav/docker-compose.yml b/apps/grav/docker-compose.yml
new file mode 100644
index 00000000..d6846cdf
--- /dev/null
+++ b/apps/grav/docker-compose.yml
@@ -0,0 +1,23 @@
+version: "3"
+
+services:
+  grav:
+    container_name: grav
+    image: lscr.io/linuxserver/grav:1.7.39.4-ls97
+    ports:
+      - ${APP_PORT}:80
+    volumes:
+      - ${APP_DATA_DIR}/data/grav-comfig:/config
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - TZ=${TZ}
+    networks:
+      - tipi_main_network
+    labels:
+      traefik.enable: ${APP_EXPOSED}
+      traefik.http.routers.grav.rule: Host(`${APP_DOMAIN}`)
+      traefik.http.routers.grav.entrypoints: websecure
+      traefik.http.routers.grav.service: grav
+      traefik.http.routers.grav.tls.certresolver: myresolver
+      traefik.http.services.grav.loadbalancer.server.port: 80
\ No newline at end of file
diff --git a/apps/grav/metadata/description.md b/apps/grav/metadata/description.md
new file mode 100644
index 00000000..107464b6
--- /dev/null
+++ b/apps/grav/metadata/description.md
@@ -0,0 +1,23 @@
+## [README.md](https://github.com/getgrav/grav//#readme)
+
+# [](https://github.com/getgrav/grav//#-grav)[![](https://avatars1.githubusercontent.com/u/8237355?v=2&s=50)](https://avatars1.githubusercontent.com/u/8237355?v=2&s=50) Grav
+
+
+Grav is a **Fast**, **Simple**, and **Flexible**, file-based Web-platform. There is **Zero** installation required. Just extract the ZIP archive, and you are already up and running. It follows similar principles to other flat-file CMS platforms, but has a different design philosophy than most. Grav comes with a powerful **Package Management System** to allow for simple installation and upgrading of plugins and themes, as well as simple updating of Grav itself.
+
+The underlying architecture of Grav is designed to use well-established and _best-in-class_ technologies to ensure that Grav is simple to use and easy to extend. Some of these key technologies include:
+
+-   [Twig Templating](https://twig.symfony.com/): for powerful control of the user interface
+-   [Markdown](https://en.wikipedia.org/wiki/Markdown): for easy content creation
+-   [YAML](https://yaml.org): for simple configuration
+-   [Parsedown](https://parsedown.org/): for fast Markdown and Markdown Extra support
+-   [Doctrine Cache](https://www.doctrine-project.org/projects/doctrine-orm/en/latest/reference/caching.html): layer for performance
+-   [Pimple Dependency Injection Container](https://github.com/silexphp/Pimple): for extensibility and maintainability
+-   [Symfony Event Dispatcher](https://symfony.com/doc/current/components/event_dispatcher/introduction.html): for plugin event handling
+-   [Symfony Console](https://symfony.com/doc/current/components/console/introduction.html): for CLI interface
+-   [Gregwar Image Library](https://github.com/Gregwar/Image): for dynamic image manipulation
+
+
+# [](https://github.com/getgrav/grav//#documentation)Documentation
+
+The full documentation can be found from [learn.getgrav.org](https://learn.getgrav.org).
\ No newline at end of file
diff --git a/apps/grav/metadata/logo.jpg b/apps/grav/metadata/logo.jpg
new file mode 100644
index 00000000..2990ade2
Binary files /dev/null and b/apps/grav/metadata/logo.jpg differ