diff --git a/apps/flightlog/config.json b/apps/flightlog/config.json
new file mode 100644
index 00000000..277a3fa4
--- /dev/null
+++ b/apps/flightlog/config.json
@@ -0,0 +1,23 @@
+{
+  "$schema": "../schema.json",
+  "name": "Flightlog",
+  "available": true,
+  "exposable": true,
+  "port": 8934,
+  "id": "flightlog",
+  "tipi_version": 1,
+  "version": "2.0.1",
+  "categories": [
+    "utilities", 
+    "data"
+  ],
+  "description": "Easily keep track of your flight history",
+  "short_desc": "Flightlog, a web application that keeps track of your personal flight history",
+  "author": "perdian",
+  "source": "https://github.com/perdian/flightlog/",
+  "form_fields": [],
+  "supported_architectures": [
+    "arm64",
+    "amd64"
+  ]
+}
diff --git a/apps/flightlog/docker-compose.yml b/apps/flightlog/docker-compose.yml
new file mode 100644
index 00000000..ea2a3779
--- /dev/null
+++ b/apps/flightlog/docker-compose.yml
@@ -0,0 +1,40 @@
+version: '3.7'
+
+services:
+  flightlog:
+    container_name: flightlog
+    image: perdian/flightlog:v2.0.1
+    environment:
+      - FLIGHTLOG_SERVER_CONTEXT_PATH=/
+    volumes:
+      - ${APP_DATA_DIR}/data/db:/var/flightlog/database
+    ports:
+      - ${APP_PORT}:8080
+    networks:
+      - tipi_main_network
+    labels:
+      # Main
+      traefik.enable: true
+      traefik.http.middlewares.flightlog-web-redirect.redirectscheme.scheme: https
+      traefik.http.services.flightlog.loadbalancer.passhostheader: true
+      traefik.http.services.flightlog.loadbalancer.server.port: 8080
+      # Web
+      traefik.http.routers.flightlog-insecure.rule: Host(`${APP_DOMAIN}`)
+      traefik.http.routers.flightlog-insecure.entrypoints: web
+      traefik.http.routers.flightlog-insecure.service: flightlog
+      traefik.http.routers.flightlog-insecure.middlewares: flightlog-web-redirect
+      # Websecure
+      traefik.http.routers.flightlog.rule: Host(`${APP_DOMAIN}`)
+      traefik.http.routers.flightlog.entrypoints: websecure
+      traefik.http.routers.flightlog.service: flightlog
+      traefik.http.routers.flightlog.tls.certresolver: myresolver
+      # Local domain
+      traefik.http.routers.flightlog-local-insecure.rule: Host(`flightlog.${LOCAL_DOMAIN}`)
+      traefik.http.routers.flightlog-local-insecure.entrypoints: web
+      traefik.http.routers.flightlog-local-insecure.service: flightlog
+      traefik.http.routers.flightlog-local-insecure.middlewares: flightlog-web-redirect
+      # Local domain secure
+      traefik.http.routers.flightlog-local.rule: Host(`flightlog.${LOCAL_DOMAIN}`)
+      traefik.http.routers.flightlog-local.entrypoints: websecure
+      traefik.http.routers.flightlog-local.service: flightlog
+      traefik.http.routers.flightlog-local.tls: true
diff --git a/apps/flightlog/metadata/description.md b/apps/flightlog/metadata/description.md
new file mode 100644
index 00000000..d5fef50c
--- /dev/null
+++ b/apps/flightlog/metadata/description.md
@@ -0,0 +1,5 @@
+# Flightlog: Easily keep track of your personal flight history
+
+Flightlog is a web application inspired by [Flugstatistik](https://flugstatistik.de), with more features, a modern UI and a streamlined user experience.
+
+Read more on [GitHub](https://github.com/perdian/flightlog)
diff --git a/apps/flightlog/metadata/logo.jpg b/apps/flightlog/metadata/logo.jpg
new file mode 100644
index 00000000..0080d9ba
Binary files /dev/null and b/apps/flightlog/metadata/logo.jpg differ