diff --git a/Dockerfile b/Dockerfile
index 9b19c81..b7852c2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine:3.20
+FROM ghcr.io/linuxserver/baseimage-alpine:3.21
 
 ARG BUILD_DATE
 ARG VERSION
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index c2eaf6c..30d3e1a 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.21
 
 ARG BUILD_DATE
 ARG VERSION
diff --git a/README.md b/README.md
index 630da80..c9cddaa 100644
--- a/README.md
+++ b/README.md
@@ -293,4 +293,5 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **12.01.25:** - Rebase to 3.21.
 * **23.07.24:** - Initial Release.
diff --git a/readme-vars.yml b/readme-vars.yml
index 0772865..3b12a5f 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -28,6 +28,8 @@ param_ports:
 opt_param_usage_include_vols: true
 opt_param_volumes:
   - {vol_path: "/libraries", vol_host_path: "/path/to/libraries", desc: "Location of your 3D model libraries."}
+readonly_supported: false
+nonroot_supported: false
 # application setup block
 app_setup_block_enabled: true
 app_setup_block: |
@@ -83,4 +85,5 @@ init_diagram: |
   "manyfold:latest" <- Base Images
 # changelog
 changelogs:
+  - {date: "12.01.25:", desc: "Rebase to Alpine 3.21."}
   - {date: "23.07.24:", desc: "Initial Release."}
diff --git a/root/etc/s6-overlay/s6-rc.d/init-manyfold-config/run b/root/etc/s6-overlay/s6-rc.d/init-manyfold-config/run
index 7929bbe..8c0c58b 100755
--- a/root/etc/s6-overlay/s6-rc.d/init-manyfold-config/run
+++ b/root/etc/s6-overlay/s6-rc.d/init-manyfold-config/run
@@ -24,34 +24,35 @@ if [[ ${DB_SCHEME} = "sqlite3" ]]; then
     lsiown -R abc:abc \
         /config
 elif [[ ${DB_SCHEME} = "postgresql" ]]; then
-    DB_HOST=$(awk -F"@|:" '{print $4}' <<<"${DATABASE_URL}")
-    DB_PORT=$(awk -F"@|/" '{print $6}' <<<"${DATABASE_URL}")
+    DB_HOST=$(awk -F '@|:|/' '{print $6}' <<<"${DATABASE_URL}")
+    DB_PORT=$(awk -F '@|:|/' '{print $7}' <<<"${DATABASE_URL}")
+    DB_USER=$(awk -F '@|:|/' '{print $4}' <<<"${DATABASE_URL}")
     if [[ ! ${DB_PORT} =~ [0-9]+ ]]; then DB_PORT=5432; fi
     echo "Waiting for DB to be available"
     END=$((SECONDS + 30))
     while [[ ${SECONDS} -lt ${END} ]] && [[ -n "${DB_HOST+x}" ]]; do
-        if pg_isready -h "${DB_HOST}" -p "${DB_PORT}" -q; then
-            if [[ ! -f /dbwait.lock ]]; then
+        if pg_isready -h "${DB_HOST}" -p "${DB_PORT}" -U "${DB_USER}" -q; then
+            if [[ ! -f /run/dbwait.lock ]]; then
                 sleep 5
             fi
-            touch /dbwait.lock
+            touch /run/dbwait.lock
             break
         else
             sleep 1
         fi
     done
 elif [[ ${DB_SCHEME} = "mysql2" ]]; then
-    DB_HOST=$(awk -F"@|:" '{print $4}' <<<"${DATABASE_URL}")
-    DB_PORT=$(awk -F"@|/" '{print $6}' <<<"${DATABASE_URL}")
+    DB_HOST=$(awk -F '@|:|/' '{print $6}' <<<"${DATABASE_URL}")
+    DB_PORT=$(awk -F '@|:|/' '{print $7}' <<<"${DATABASE_URL}")
     if [[ ! ${DB_PORT} =~ [0-9]+ ]]; then DB_PORT=3306; fi
     echo "Waiting for DB to be available"
     END=$((SECONDS + 30))
     while [[ ${SECONDS} -lt ${END} ]] && [[ -n "${DB_HOST+x}" ]]; do
         if [[ $(/usr/bin/nc -w1 "${DB_HOST}" "${DB_PORT}" | tr -d '\0') ]]; then
-            if [[ ! -f /dbwait.lock ]]; then
+            if [[ ! -f /run/dbwait.lock ]]; then
                 sleep 5
             fi
-            touch /dbwait.lock
+            touch /run/dbwait.lock
             break
         else
             sleep 1
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-manyfold/run b/root/etc/s6-overlay/s6-rc.d/svc-manyfold/run
index 9772290..c3dbf91 100755
--- a/root/etc/s6-overlay/s6-rc.d/svc-manyfold/run
+++ b/root/etc/s6-overlay/s6-rc.d/svc-manyfold/run
@@ -3,4 +3,4 @@
 
 exec \
     s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 3214" \
-    cd /app/www s6-setuidgid abc foreman start
+        cd /app/www s6-setuidgid abc foreman start