diff --git a/README.md b/README.md
index e4608f20..c98ca5dd 100644
--- a/README.md
+++ b/README.md
@@ -37,6 +37,7 @@ This is the official repository for the Tipi App Store. It contains all the apps
 - [Filestash](https://github.com/mickael-kerjean/filestash) - A modern web client for SFTP, S3, FTP, WebDAV, Git, Minio, LDAP, CalDAV, CardDAV, Mysql, Backblaze
 - [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
+- [Flaresolverr](https://github.com/FlareSolverr/FlareSolverr) - FlareSolverr is a proxy server to bypass Cloudflare and DDoS-GUARD protection.
 - [Flatnotes](https://github.com/Dullage/flatnotes) - A self-hosted, database-less note taking web app
 - [Freshrss](https://github.com/FreshRSS/FreshRSS) - A free, self-hostable RSS aggregator
 - [gandi-livedns](https://github.com/jbbodart/gandi-livedns) - Update your Gandi DNS zone records with your WAN IP
diff --git a/apps/flaresolverr/config.json b/apps/flaresolverr/config.json
new file mode 100644
index 00000000..91f2c5d6
--- /dev/null
+++ b/apps/flaresolverr/config.json
@@ -0,0 +1,23 @@
+{
+  "$schema": "../schema.json",
+  "name": "Flaresolverr",
+  "port": 8666,
+  "available": true,
+  "exposable": false,
+  "no_gui": true,
+  "id": "flaresolverr",
+  "tipi_version": 3,
+  "version": "3.3.7",
+  "categories": [
+    "media",
+    "security",
+    "utilities"
+  ],
+  "description": "FlareSolverr is a proxy server to bypass Cloudflare and DDoS-GUARD protection.",
+  "short_desc": "Bypass Cloudflare and DDoS-GuARD.",
+  "author": "FlareSolverr Team",
+  "source": "https://github.com/FlareSolverr/FlareSolverr",
+  "website": "https://github.com/FlareSolverr/FlareSolverr",
+  "form_fields": [],
+  "supported_architectures": ["arm64", "amd64"]
+}
diff --git a/apps/flaresolverr/docker-compose.yml b/apps/flaresolverr/docker-compose.yml
new file mode 100644
index 00000000..4595a45a
--- /dev/null
+++ b/apps/flaresolverr/docker-compose.yml
@@ -0,0 +1,13 @@
+services:
+  flaresolverr:
+    container_name: flaresolverr
+    image: ghcr.io/flaresolverr/flaresolverr:v3.3.7
+    restart: unless-stopped
+    environment:
+      - LOG_LEVEL=${FLARESOLVERR_LOG_LEVEL-info}
+      - TZ=${TZ}
+    networks:
+      - tipi_main_network
+    labels:
+      # Main
+      traefik.enable: false
\ No newline at end of file
diff --git a/apps/flaresolverr/metadata/description.md b/apps/flaresolverr/metadata/description.md
new file mode 100644
index 00000000..0875b079
--- /dev/null
+++ b/apps/flaresolverr/metadata/description.md
@@ -0,0 +1,18 @@
+# FlareSolverr
+
+FlareSolverr is a proxy server to bypass Cloudflare and DDoS-GUARD protection.
+
+## How it works
+
+FlareSolverr starts a proxy server, and it waits for user requests in an idle state using few resources.
+When some request arrives, it uses [Selenium](https://www.selenium.dev) with the
+[undetected-chromedriver](https://github.com/ultrafunkamsterdam/undetected-chromedriver)
+to create a web browser (Chrome). It opens the URL with user parameters and waits until the Cloudflare challenge
+is solved (or timeout). The HTML code and the cookies are sent back to the user, and those cookies can be used to
+bypass Cloudflare using other HTTP clients.
+
+**NOTE**: Web browsers consume a lot of memory. If you are running FlareSolverr on a machine with few RAM, do not make
+many requests at once. With each request a new browser is launched.
+
+It is also possible to use a permanent session. However, if you use sessions, you should make sure to close them as
+soon as you are done using them.
diff --git a/apps/flaresolverr/metadata/logo.jpg b/apps/flaresolverr/metadata/logo.jpg
new file mode 100644
index 00000000..eb7335f6
Binary files /dev/null and b/apps/flaresolverr/metadata/logo.jpg differ