diff --git a/servapps/Firefly-III/cosmos-compose.json b/servapps/Firefly-III/cosmos-compose.json
new file mode 100644
index 00000000..11130b57
--- /dev/null
+++ b/servapps/Firefly-III/cosmos-compose.json
@@ -0,0 +1,84 @@
+{
+  "cosmos-installer": {},
+  "minVersion": "0.7.6",
+  "services": {
+    "{ServiceName}": {
+      "image": "fireflyiii/core:latest",
+      "container_name": "{ServiceName}",
+      "hostname": "{ServiceName}",
+      "restart": "unless-stopped",
+      "environment": [
+        "TZ=auto",
+        "APP_KEY={Passwords.0}00000000",
+        "TRUSTED_PROXIES=**",
+        "DB_CONNECTION=mysql",
+        "DB_HOST={ServiceName}-db",
+        "DB_PORT=3306",
+        "DB_DATABASE=firefly",
+        "DB_USERNAME=firefly",
+        "DB_PASSWORD={Passwords.1}"
+      ],
+      "labels": {
+        "cosmos-persistent-env": "APP_KEY, DB_DATABASE, DB_USERNAME, DB_PASSWORD",
+        "cosmos-force-network-secured": "true",
+        "cosmos-auto-update": "true",
+        "cosmos-icon": "https://azukaar.github.io/cosmos-servapps-official/servapps/Firefly-III/icon.png"
+      },
+      "networks": {
+        "{ServiceName}": {}
+      },
+      "volumes": [
+        {
+          "source": "{ServiceName}-upload",
+          "target": "/var/www/html/storage/upload",
+          "type": "volume"
+        }
+      ],
+      "routes": [
+        {
+          "name": "{ServiceName}",
+          "description": "Expose {ServiceName} to the web",
+          "useHost": true,
+          "target": "http://{ServiceName}:8080",
+          "mode": "SERVAPP",
+          "Timeout": 14400000,
+          "ThrottlePerMinute": 12000,
+          "BlockCommonBots": true,
+          "SmartShield": {
+            "Enabled": true
+          }
+        }
+      ]
+    },
+
+    "{ServiceName}-db": {
+      "image": "mariadb:10.11",
+      "container_name": "{ServiceName}-db",
+      "hostname": "{ServiceName}-db",
+      "restart": "unless-stopped",
+      "networks": {
+        "{ServiceName}": {}
+      },
+      "volumes": [
+        {
+          "source": "{ServiceName}-db",
+          "target": "/var/lib/mysql",
+          "type": "volume"
+        }
+      ],
+      "environment": [
+        "MARIADB_DATABASE=firefly",
+        "MARIADB_USER=firefly",
+        "MARIADB_PASSWORD={Passwords.1}",
+        "MARIADB_ROOT_PASSWORD={Passwords.2}"
+      ],
+      "labels": {
+        "cosmos-persistent-env": "MARIADB_DATABASE, MARIADB_USER, MARIADB_PASSWORD, MARIADB_ROOT_PASSWORD",
+      },
+    }
+  },
+
+  "networks": {
+    "{ServiceName}": {}
+  }
+}
diff --git a/servapps/Firefly-III/description.json b/servapps/Firefly-III/description.json
new file mode 100644
index 00000000..e56672cd
--- /dev/null
+++ b/servapps/Firefly-III/description.json
@@ -0,0 +1,9 @@
+{
+  "name": "Firefly III",
+  "description": "A free and open source personal finance manager",
+  "longDescription": "<p>Firefly III is a (self-hosted) manager for your personal finances. It can help you keep track of your expenses and income, so you can spend less and save more. Firefly III supports the use of budgets, categories and tags. Using a bunch of external tools, you can import data. It also has many neat financial reports available.</p>",
+  "tags": ["money", "personal-finance", "finance", "credit-card", "budgeting", "cash-flow", "budget", "expenses", "paycheck"],
+  "repository": "https://github.com/firefly-iii/firefly-iii",
+  "image": "https://hub.docker.com/r/fireflyiii/core",
+  "supported_architectures": ["amd64", "arm64"]
+}
\ No newline at end of file
diff --git a/servapps/Firefly-III/icon.png b/servapps/Firefly-III/icon.png
new file mode 100644
index 00000000..ad0fd4d9
Binary files /dev/null and b/servapps/Firefly-III/icon.png differ
diff --git a/servapps/Firefly-III/screenshots/1.png b/servapps/Firefly-III/screenshots/1.png
new file mode 100644
index 00000000..a70f9c24
Binary files /dev/null and b/servapps/Firefly-III/screenshots/1.png differ
diff --git a/servapps/Firefly-III/screenshots/2.png b/servapps/Firefly-III/screenshots/2.png
new file mode 100644
index 00000000..d0476694
Binary files /dev/null and b/servapps/Firefly-III/screenshots/2.png differ