diff --git a/lsio/lychee/docker-compose.yaml b/lsio/lychee/docker-compose.yaml
index 522d2e7..7b9c4f9 100644
--- a/lsio/lychee/docker-compose.yaml
+++ b/lsio/lychee/docker-compose.yaml
@@ -1,46 +1,45 @@
 # [Lychee](https://lycheeorg.github.io/) is a free photo-management tool, which
 # runs on your server or web-space. Installing is a matter of seconds. Upload,
 # manage and share photos like from a native application. Lychee comes with
-# everything you need and all your photos are stored securely.' ### UPGRADE
-# WARNING Please note that the v4 upgrade process resets ALL password-protected
-# albums. Any albums that were made public with a password will need to be re-
-# secured.
+# everything you need and all your photos are stored securely.'
 
-version: "3"
+---
+version: "2.1"
 services:
-  mariadb:
-    image: lscr.io/linuxserver/mariadb:latest
-    container_name: lychee_mariadb
-    restart: always
-    volumes:
-      - /path/to/mariadb/data:/config
-    environment:
-      - MYSQL_ROOT_PASSWORD=rootpassword
-      - MYSQL_DATABASE=lychee
-      - MYSQL_USER=lychee
-      - MYSQL_PASSWORD=dbpassword
-      - PGID=1000
-      - PUID=1000
-      - TZ=Europe/London
   lychee:
-    image: lscr.io/linuxserver/lychee:latest
+    image: ghcr.io/linuxserver/lychee
     container_name: lychee
-    restart: always
-    depends_on:
-      - mariadb
-    volumes:
-      - /path/to/config:/config
-      - /path/to/pictures:/pictures
     environment:
-      - DB_CONNECTION=mysql
-      - DB_HOST=mariadb
-      - DB_PORT=3306
-      - DB_USERNAME=lychee
-      - DB_PASSWORD=dbpassword
-      - DB_DATABASE=lychee
-      - PGID=1000
-      - PUID=1000
-      - TZ=Europe/London
+      # for UserID
+      - PUID=${PUID:-1024}
+      # for GroupID
+      - PGID=${PGID:-100}
+      # specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List).
+      - TZ=${TZ:-Europe/Amsterdam}
+      # DB type, from `sqlite`, `mysql`, `pqsql`.
+      - DB_CONNECTION=
+      # DB server hostname. For `mysql` and `pgsql` only.
+      - DB_HOST=
+      # DB server port. For `mysql` and `pgsql` only.
+      - DB_PORT=
+      # DB user. For `mysql` and `pgsql` only.
+      - DB_USERNAME=
+      # DB password. For `mysql` and `pgsql` only.
+      - DB_PASSWORD=
+      # Path to DB file for `sqlite`. DB name for `mysql` and `pgsql`.
+      - DB_DATABASE=
+      # The gallery name.
+      - APP_NAME=Lychee # optional
+      # The URL you will use to access Lychee including protocol, and port where appropriate.
+      - APP_URL= # optional
+      # Set to `true` if running behind an https reverse proxy.
+      - APP_FORCE_HTTPS= # optional
+    volumes:
+      # Persistent config files.
+      - ${BASEDIR:-/volume1/docker}/lychee/config:/config
+      # Where lychee will store uploaded images.
+      - ${BASEDIR:-/volume1/docker}/lychee/pictures:/pictures
     ports:
+      # http gui
       - 80:80
-
+    restart: unless-stopped
diff --git a/lsio/lychee/docker-run.sh b/lsio/lychee/docker-run.sh
index 5474416..0ebcf08 100644
--- a/lsio/lychee/docker-run.sh
+++ b/lsio/lychee/docker-run.sh
@@ -1,10 +1,7 @@
 # [Lychee](https://lycheeorg.github.io/) is a free photo-management tool, which
 # runs on your server or web-space. Installing is a matter of seconds. Upload,
 # manage and share photos like from a native application. Lychee comes with
-# everything you need and all your photos are stored securely.' ### UPGRADE
-# WARNING Please note that the v4 upgrade process resets ALL password-protected
-# albums. Any albums that were made public with a password will need to be re-
-# secured.
+# everything you need and all your photos are stored securely.'
 
 . ./.env
 docker run -d \
@@ -12,14 +9,17 @@ docker run -d \
   -e PUID=${PUID:-1024} `# for UserID` \
   -e PGID=${PGID:-100} `# for GroupID` \
   -e TZ=${TZ:-Europe/Amsterdam} `# specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List).` \
-  -e DB_CONNECTION=mysql `# for specifying the database type` \
-  -e DB_HOST=mariadb `# for specifying the database host` \
-  -e DB_PORT=3306 `# for specifying the database port` \
-  -e DB_USERNAME=lychee `# for specifying the database user` \
-  -e DB_PASSWORD=dbpassword `# for specifying the database password` \
-  -e DB_DATABASE=lychee `# for specifying the database to be used` \
+  -e DB_CONNECTION= `# DB type, from `sqlite`, `mysql`, `pqsql`.` \
+  -e DB_HOST= `# DB server hostname. For `mysql` and `pgsql` only.` \
+  -e DB_PORT= `# DB server port. For `mysql` and `pgsql` only.` \
+  -e DB_USERNAME= `# DB user. For `mysql` and `pgsql` only.` \
+  -e DB_PASSWORD= `# DB password. For `mysql` and `pgsql` only.` \
+  -e DB_DATABASE= `# Path to DB file for `sqlite`. DB name for `mysql` and `pgsql`.` \
+  -e APP_NAME=Lychee `# optional` `# The gallery name.` \
+  -e APP_URL= `# optional` `# The URL you will use to access Lychee including protocol, and port where appropriate.` \
+  -e APP_FORCE_HTTPS= `# optional` `# Set to `true` if running behind an https reverse proxy.` \
   -p 80:80 `# http gui` \
-  -v ${BASEDIR:-/volume1/docker}/lychee/config:/config `# Contains all relevant configuration files.` \
-  -v ${BASEDIR:-/volume1/docker}/lychee/pictures:/pictures `# Where lychee will store uploaded data.` \
+  -v ${BASEDIR:-/volume1/docker}/lychee/config:/config `# Persistent config files.` \
+  -v ${BASEDIR:-/volume1/docker}/lychee/pictures:/pictures `# Where lychee will store uploaded images.` \
   --restart unless-stopped \
   ghcr.io/linuxserver/lychee
diff --git a/lsio/swag/docker-compose.yaml b/lsio/swag/docker-compose.yaml
index 490bfd2..ac5a259 100644
--- a/lsio/swag/docker-compose.yaml
+++ b/lsio/swag/docker-compose.yaml
@@ -27,7 +27,7 @@ services:
       - SUBDOMAINS=www, # optional
       # Optionally define the cert provider. Set to `zerossl` for ZeroSSL certs (requires existing [ZeroSSL account](https://app.zerossl.com/signup) and the e-mail address entered in `EMAIL` env var). Otherwise defaults to Let's Encrypt.
       - CERTPROVIDER= # optional
-      # Required if `VALIDATION` is set to `dns`. Options are `acmedns`, `aliyun`, `azure`, `bunny`, `cloudflare`, `cpanel`, `desec`, `digitalocean`, `directadmin`, `dnsimple`, `dnsmadeeasy`, `dnspod`, `do`, `domeneshop`, `dreamhost`, `duckdns`, `freedns`, `gandi`, `gehirn`, `godaddy`, `google`, `google-domains`, `he`, `hetzner`, `infomaniak`, `inwx`, `ionos`, `linode`, `loopia`, `luadns`, `namecheap`, `netcup`, `njalla`, `nsone`, `ovh`, `porkbun`, `rfc2136`, `route53`, `sakuracloud`, `standalone`, `transip`, and `vultr`. Also need to enter the credentials into the corresponding ini (or json for some plugins) file under `/config/dns-conf`.
+      # Required if `VALIDATION` is set to `dns`. Options are `acmedns`, `aliyun`, `azure`, `bunny`, `cloudflare`, `cpanel`, `desec`, `digitalocean`, `directadmin`, `dnsimple`, `dnsmadeeasy`, `dnspod`, `do`, `domeneshop`, `dreamhost`, `duckdns`, `freedns`, `gandi`, `gehirn`, `glesys`, `godaddy`, `google`, `google-domains`, `he`, `hetzner`, `infomaniak`, `inwx`, `ionos`, `linode`, `loopia`, `luadns`, `namecheap`, `netcup`, `njalla`, `nsone`, `ovh`, `porkbun`, `rfc2136`, `route53`, `sakuracloud`, `standalone`, `transip`, and `vultr`. Also need to enter the credentials into the corresponding ini (or json for some plugins) file under `/config/dns-conf`.
       - DNSPLUGIN=cloudflare # optional
       # Optionally override (in seconds) the default propagation time for the dns plugins.
       - PROPAGATION= # optional
diff --git a/lsio/swag/docker-run.sh b/lsio/swag/docker-run.sh
index 08d6721..6300073 100644
--- a/lsio/swag/docker-run.sh
+++ b/lsio/swag/docker-run.sh
@@ -15,7 +15,7 @@ docker run -d \
   -e VALIDATION=http `# Certbot validation method to use, options are `http` or `dns` (`dns` method also requires `DNSPLUGIN` variable set).` \
   -e SUBDOMAINS=www, `# optional` `# Subdomains you'd like the cert to cover (comma separated, no spaces) ie. `www,ftp,cloud`. For a wildcard cert, set this *exactly* to `wildcard` (wildcard cert is available via `dns` validation only)` \
   -e CERTPROVIDER= `# optional` `# Optionally define the cert provider. Set to `zerossl` for ZeroSSL certs (requires existing [ZeroSSL account](https://app.zerossl.com/signup) and the e-mail address entered in `EMAIL` env var). Otherwise defaults to Let's Encrypt.` \
-  -e DNSPLUGIN=cloudflare `# optional` `# Required if `VALIDATION` is set to `dns`. Options are `acmedns`, `aliyun`, `azure`, `bunny`, `cloudflare`, `cpanel`, `desec`, `digitalocean`, `directadmin`, `dnsimple`, `dnsmadeeasy`, `dnspod`, `do`, `domeneshop`, `dreamhost`, `duckdns`, `freedns`, `gandi`, `gehirn`, `godaddy`, `google`, `google-domains`, `he`, `hetzner`, `infomaniak`, `inwx`, `ionos`, `linode`, `loopia`, `luadns`, `namecheap`, `netcup`, `njalla`, `nsone`, `ovh`, `porkbun`, `rfc2136`, `route53`, `sakuracloud`, `standalone`, `transip`, and `vultr`. Also need to enter the credentials into the corresponding ini (or json for some plugins) file under `/config/dns-conf`.` \
+  -e DNSPLUGIN=cloudflare `# optional` `# Required if `VALIDATION` is set to `dns`. Options are `acmedns`, `aliyun`, `azure`, `bunny`, `cloudflare`, `cpanel`, `desec`, `digitalocean`, `directadmin`, `dnsimple`, `dnsmadeeasy`, `dnspod`, `do`, `domeneshop`, `dreamhost`, `duckdns`, `freedns`, `gandi`, `gehirn`, `glesys`, `godaddy`, `google`, `google-domains`, `he`, `hetzner`, `infomaniak`, `inwx`, `ionos`, `linode`, `loopia`, `luadns`, `namecheap`, `netcup`, `njalla`, `nsone`, `ovh`, `porkbun`, `rfc2136`, `route53`, `sakuracloud`, `standalone`, `transip`, and `vultr`. Also need to enter the credentials into the corresponding ini (or json for some plugins) file under `/config/dns-conf`.` \
   -e PROPAGATION= `# optional` `# Optionally override (in seconds) the default propagation time for the dns plugins.` \
   -e EMAIL= `# optional` `# Optional e-mail address used for cert expiration notifications (Required for ZeroSSL).` \
   -e ONLY_SUBDOMAINS=false `# optional` `# If you wish to get certs only for certain subdomains, but not the main domain (main domain may be hosted on another machine and cannot be validated), set this to `true`` \