diff --git a/firefly-iii/data/logs/.gitkeep b/firefly-iii/data/logs/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/firefly-iii/data/mysql/.gitkeep b/firefly-iii/data/mysql/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/firefly-iii/data/upload/.gitkeep b/firefly-iii/data/upload/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/firefly-iii/docker-compose.yml b/firefly-iii/docker-compose.yml
new file mode 100644
index 0000000..bfd772e
--- /dev/null
+++ b/firefly-iii/docker-compose.yml
@@ -0,0 +1,38 @@
+version: "3.7"
+
+services:
+  app_proxy:
+    environment:
+      APP_HOST: firefly-iii_server_1
+      APP_PORT: 8080
+      PROXY_AUTH_WHITELIST: "/api/*"
+
+  server:
+    image: fireflyiii/core:version-5.7.18@sha256:f72a0dfcc2e12fb96d4a7f1e64834518692914ce40565904473f64401c1bda58
+    # This image runs under the user/group www-data:www-data
+    # user: "1000:1000"
+    restart: on-failure
+    environment:
+      APP_KEY: $APP_FIREFLY_III_APP_KEY
+      DB_HOST: firefly-iii_db_1
+      DB_PORT: 3306
+      DB_CONNECTION: mysql
+      DB_DATABASE: fireflyiii
+      DB_USERNAME: fireflyiii
+      DB_PASSWORD: moneyprintergobrrr
+    volumes:
+      - ${APP_DATA_DIR}/data/upload:/var/www/html/storage/upload
+      - ${APP_DATA_DIR}/data/logs:/var/www/html/storage/logs
+  
+  db:
+    image: mariadb:10.9.4@sha256:f5146e2e0999a6afcf2a9134bb415ad068bf80ec29704f374f6f7dabb145738d
+    user: "1000:1000"
+    restart: on-failure
+    stop_grace_period: 1m
+    volumes:
+      - ${APP_DATA_DIR}/data/mysql:/var/lib/mysql
+    environment:
+      MYSQL_DATABASE: "fireflyiii"
+      MYSQL_USER: "fireflyiii"
+      MYSQL_PASSWORD: "moneyprintergobrrr"
+      MYSQL_ROOT_PASSWORD: "moneyprintergobrrr"
\ No newline at end of file
diff --git a/firefly-iii/exports.sh b/firefly-iii/exports.sh
new file mode 100644
index 0000000..58de982
--- /dev/null
+++ b/firefly-iii/exports.sh
@@ -0,0 +1 @@
+export APP_FIREFLY_III_APP_KEY=$(derive_entropy "env-${app_entropy_identifier}-APP_KEY" | head -c32)
\ No newline at end of file
diff --git a/firefly-iii/umbrel-app.yml b/firefly-iii/umbrel-app.yml
new file mode 100644
index 0000000..afb5bd7
--- /dev/null
+++ b/firefly-iii/umbrel-app.yml
@@ -0,0 +1,48 @@
+manifestVersion: 1
+id: firefly-iii
+category: Finance
+name: Firefly III
+version: "5.7.18"
+tagline: Your personal finance manager
+description: >-
+  Firefly III is a manager for your personal finances. It is self-hosted and open source. This means that it's free, it has no ads and no tracking.
+
+
+  Full transaction management
+
+  Firefly III features a double-entry bookkeeping system. You can quickly enter and organize your transactions in multiple currencies.
+
+
+  Advanced rule engine
+
+  Use rules to quickly convert shorthands to detailed transactions or clean up your bank's abysmal CSV files.
+
+
+  Budgets, categories and tags
+
+  Name your poison. Do you like to work with tags? Need to budget your expenses? Want to categorize all of your hobby expenses? Look no further. Firefly III supports all kinds. Budgets can be expanded with limits in multiple currencies, so you can budget both your daily household expenses and what you spend in Imperial Credits when visiting Tatooine.
+
+
+  Informative reports
+
+  Firefly III has advanced reporting capabilities, showing your expenses per week, month or year. But it can also help you audit your accounts with detailed list views. Or perhaps compare budgets or tags? It's all possible.
+
+
+  JSON rest API
+
+  For the advanced and mobile users out there, Firefly III features an expansive JSON REST API that allows you to tap into Firefly III's most important features. Create transactions, manage categories and get chart data from any app or system.
+developer: Firefly III
+website: https://www.firefly-iii.org/
+dependencies: []
+repo: https://github.com/firefly-iii/firefly-iii
+support: https://docs.firefly-iii.org/firefly-iii
+port: 30009
+gallery:
+  - 1.jpg
+  - 2.jpg
+  - 3.jpg
+path: ""
+deterministicPassword: false
+torOnly: false
+submitter: Umbrel
+submission: https://github.com/getumbrel/umbrel-apps/pull/378
\ No newline at end of file