diff --git a/hosts/miniserver/configuration.nix b/hosts/miniserver/configuration.nix
index 46a7fe9..1ec90d1 100644
--- a/hosts/miniserver/configuration.nix
+++ b/hosts/miniserver/configuration.nix
@@ -57,6 +57,7 @@
       shiori.enable = true;
       sonarr.enable = false;
       vaultwarden.enable = true;
+      firefly-iii.enable = true;
     };
   };
   networking = {
diff --git a/modules/servers.nix b/modules/servers.nix
index 047cfc5..d1f90db 100644
--- a/modules/servers.nix
+++ b/modules/servers.nix
@@ -68,6 +68,7 @@ in {
       inherit lib config serviceBase proxyReverse;
     })
     (import ./servers/vaultwarden.nix { inherit lib config pkgs proxyReverse; })
+    (import ./servers/firefly-iii.nix { inherit lib config pkgs proxyReverse; })
   ];
   options.my = {
     localhost = lib.mkOption {
@@ -144,6 +145,7 @@ in {
       shiori.enable = lib.mkDefault false;
       sonarr.enable = lib.mkDefault false;
       vaultwarden.enable = lib.mkDefault false;
+      firefly-iii.enable = lib.mkDefault false;
     };
     virtualisation.docker = lib.mkIf enableDocker {
       enable = true;
diff --git a/modules/servers/firefly-iii.nix b/modules/servers/firefly-iii.nix
new file mode 100644
index 0000000..33c8950
--- /dev/null
+++ b/modules/servers/firefly-iii.nix
@@ -0,0 +1,20 @@
+{ lib, config, ... }: {
+  options.my.servers.firefly-iii.enable = lib.mkEnableOption "enable";
+  config = lib.mkIf (config.my.servers.firefly-iii.enable
+    && config.my.servers.postgres.enable) {
+      sops.secrets.firefly-iii-keyfile = {
+        owner = config.users.users.firefly-iii.name;
+        inherit (config.users.users.firefly-iii) group;
+      };
+      services.firefly-iii = {
+        enable = true;
+        virtualHost = "money.servidos.lat";
+        enableNginx = true;
+        settings = {
+          APP_KEY_FILE = config.sops.secrets.firefly-iii-keyfile.path;
+          DB_HOST = config.my.postgresSocket;
+          DB_CONNECTION = "pgsql";
+        };
+      };
+    };
+}
diff --git a/modules/servers/nextcloud.nix b/modules/servers/nextcloud.nix
index a7cd8ab..7f1a5d9 100644
--- a/modules/servers/nextcloud.nix
+++ b/modules/servers/nextcloud.nix
@@ -68,7 +68,6 @@ in {
           enable = true;
           https = true;
           package = pkgs.nextcloud29;
-          phpPackage = lib.mkForce pkgs.php82;
           appstoreEnable = true;
           configureRedis = true;
           extraAppsEnable = true;
diff --git a/modules/servers/postgres.nix b/modules/servers/postgres.nix
index c9ce16f..dae9e70 100644
--- a/modules/servers/postgres.nix
+++ b/modules/servers/postgres.nix
@@ -17,7 +17,15 @@ let
         --old-bindir $OLDBIN --new-bindir $NEWBIN \
         "$@"
     '';
-  dbNames = [ "jawz" "paperless" "nextcloud" "ryot" "vaultwarden" "shiori" ];
+  dbNames = [
+    "jawz"
+    "paperless"
+    "nextcloud"
+    "ryot"
+    "vaultwarden"
+    "shiori"
+    "firefly-iii"
+  ];
 in {
   options.my.servers.postgres.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.servers.postgres.enable {