1diff --git a/apks/firefly3/APKBUILD b/apks/firefly3/APKBUILD
  2index 9f113c013e756328be5b83f6edae040190e3cc44..f4e59bc07a75d81a7e50e1a3f3be819fe921b1bf 100644
  3--- a/apks/firefly3/APKBUILD
  4+++ b/apks/firefly3/APKBUILD
  5@@ -1,6 +1,6 @@
  6 # Maintainer: Gabriel Arakaki Giovanini <mail@gabrielgio.me>
  7 pkgname=firefly3
  8-pkgver=5.7.13
  9+pkgver=5.7.18
 10 pkgrel=4
 11 pkgdesc="A free and open source personal finance manager"
 12 url="https://firefly-iii.org"
 13@@ -41,8 +41,6 @@     $pkgname.post-install
 14 "
 15 source="
 16     ${pkgname}-${pkgver}.tar.gz::https://github.com/firefly-iii/firefly-iii/archive/refs/tags/$pkgver.tar.gz
 17-
 18-    $pkgname.nginx.conf
 19     $pkgname-env
 20 "
 21 options="!check" # no clue how to run test on this
 22@@ -51,13 +49,19 @@
 23 package() {
 24     local wwwdir="usr/share/webapps/$pkgname"
 25     local confdir="etc/$pkgname"
 26+    local lib="var/lib/$pkgname"
 27+    local log="var/log/$pkgname"
 28 
 29-    install -d -m 770 -o www-data -g www-data "$pkgdir"/$confdir
 30+    install -d -m 770 -o firefly -g firefly "$pkgdir/$confdir"
 31+    install -d -m 770 -o firefly -g firefly "$pkgdir/$lib"
 32+    install -d -m 770 -o firefly -g firefly "$pkgdir/$log"
 33 
 34     mkdir -p "$pkgdir"
 35     cd "$pkgdir"
 36 
 37     mkdir -p ./${wwwdir%/*}
 38+    mkdir -p ./"$lib"/upload
 39+    mkdir -p ./"$lib"/database
 40     cp -a "$builddir" ./$wwwdir
 41 
 42     chmod +x ./$wwwdir/artisan
 43@@ -66,12 +70,25 @@     cd ./$wwwdir
 44     composer install --prefer-dist --no-dev --no-scripts
 45     cd ..
 46 
 47-    install -m 755 -o www-data -g www-data -d "$wwwdir"
 48-
 49-    install -m 660 -o www-data -g www-data \
 50+    install -m 660  \
 51 		"$srcdir"/$pkgname-env "$pkgdir"/$confdir/env
 52 
 53     ln -s /$confdir/env "$pkgdir"/$wwwdir/.env
 54+
 55+    rm -r "$pkgdir"/$wwwdir/storage/database
 56+    ln -s /"$lib"/database "$pkgdir"/$wwwdir/storage/
 57+
 58+    rm -r "$pkgdir"/$wwwdir/storage/upload
 59+    ln -s /"$lib"/upload "$pkgdir"/$wwwdir/storage/
 60+
 61+    ln -s /"$lib"/oauth-private.key "$pkgdir"/$wwwdir/storage/oauth-private.key
 62+    ln -s /"$lib"/oauth-public.key "$pkgdir"/$wwwdir/storage/oauth-public.key
 63+
 64+    rm -r "$pkgdir"/$wwwdir/storage/logs
 65+    ln -T -s /"$log"/ "$pkgdir"/$wwwdir/storage/logs
 66+
 67+    chown -R firefly:firefly "$pkgdir"/$wwwdir/
 68+    chown -R firefly:firefly  "$pkgdir/$lib"
 69 }
 70 
 71 _mysql() {
 72@@ -92,15 +109,8 @@     pkgdesc="Sqlite dependencies for $pkgname"
 73     mkdir -p "$subpkgdir"
 74 }
 75 
 76-_nginx() {
 77-    depends="firefly3"
 78-    pkgdesc="nginx configuration for $pkgname"
 79-    install -Dm644 "$srcdir/$pkgname.nginx.conf" \
 80-        "$subpkgdir"/etc/nginx/http.d/$pkgname.conf
 81-}
 82 
 83 sha512sums="
 84-a59f89305eeb6cdb301ca86a6a3dfacd90497ce887b59b7c426bef341e7a070efc0d430c6e40277273e5aa56b86271c652f80e696cc53f0788b0624dd1b66a46  firefly3-5.7.13.tar.gz
 85-9d32e8e8bd805b09cd429eacc42fe9e746570cdc867531ac47a0b31801378e5e0fc357ef88e8d5c14617ba1887a3789a9d2f7150111b497377380df7ccdd08a7  firefly3.nginx.conf
 86+4febc482056d1c635fb674b001442dcaa6d331ce3906aeeac80497b42b38fa1e2393e6b2a0d76da884db15d000c4364d299a11e4d28b2b6ebdeba8fae638a413  firefly3-5.7.18.tar.gz
 87 b778a4113b8d4d3465a5f80a72fe04497d68d718751e2b0ee43fdbd4379b6278bdff74c68e095668f03ef3a9969de41d734cb4f7e27fb26f1a4342f0c9e0f57e  firefly3-env
 88 "
 89diff --git a/apks/firefly3/firefly3.nginx.conf b/apks/firefly3/firefly3.nginx.conf
 90deleted file mode 100644
 91index a95ebb13dabd1340da551fc4888e36fd07ae2a25..0000000000000000000000000000000000000000
 92--- a/apks/firefly3/firefly3.nginx.conf
 93+++ /dev/null
 94@@ -1,16 +0,0 @@
 95-server {
 96-    listen 80;
 97-    server_name firefly.lan;
 98-    root /var/www/firefly3/public;
 99-
100-    location ~ \.php$ {
101-        try_files $uri $uri/ =404;
102-        fastcgi_split_path_info ^(.+\.php)(/.+)$;
103-        fastcgi_pass unix:/run/php-fpm8/fpm.sock;
104-        include fastcgi.conf;
105-    }
106-
107-    location / {
108-      try_files $uri /index.php$is_args$args;
109-    }
110-}
111diff --git a/apks/firefly3/firefly3.post-install b/apks/firefly3/firefly3.post-install
112index c74ae134075e59efece54b28ae09aec055b93193..a92883d15c27ef04f278ed1613081909a2e2ab68 100644
113--- a/apks/firefly3/firefly3.post-install
114+++ b/apks/firefly3/firefly3.post-install
115@@ -3,4 +3,10 @@
116 printf "  *\n  * Add the configration to '/etc/firefly3/env' \n"
117 printf "  * Without it firefly3 won't run.\n  *\n"
118 
119+user=firefly
120+group=firefly
121+
122+chown $user:$group /usr/share/webapps/firefly3
123+chown $user:$group /var/lib/firefly3
124+
125 exit 0
126diff --git a/apks/firefly3/firefly3.pre-install b/apks/firefly3/firefly3.pre-install
127index 74f1b591e16d12b52c7f15812c77334cfe0f3151..b9622c23d2a1f76a085281683c2d2d54e904a975 100644
128--- a/apks/firefly3/firefly3.pre-install
129+++ b/apks/firefly3/firefly3.pre-install
130@@ -1,9 +1,9 @@
131 #!/bin/sh
132 
133-user=www-data
134-group=www-data
135+user=firefly
136+group=firefly
137 
138 addgroup -S $group 2>/dev/null
139-adduser -S -D -h /var/lib/$user -s /sbin/nologin -G $group -g $user $user 2>/dev/null
140+adduser -S -D -h /var/lib/"$user"3 -s /sbin/nologin -G $group -g $user $user 2>/dev/null
141 
142 exit 0