diff --git a/Dockerfile b/Dockerfile
index 44b771ba..8ce3ec6a 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
 
 # set version label
 ARG BUILD_DATE
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 4e56707b..28decc26 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
 
 # set version label
 ARG BUILD_DATE
diff --git a/README.md b/README.md
index 8083ce24..d691ef75 100644
--- a/README.md
+++ b/README.md
@@ -83,6 +83,10 @@ The folks over at servarr.com wrote a good [write-up](https://wiki.servarr.com/d
 
 This image can be run with a read-only container filesystem. For details please [read the docs](https://docs.linuxserver.io/misc/read-only/).
 
+## Non-Root Operation
+
+This image can be run with a non-root user. For details please [read the docs](https://docs.linuxserver.io/misc/non-root/).
+
 ## Usage
 
 To help you get started creating a container from this image you can either use docker-compose or the docker cli.
@@ -141,6 +145,7 @@ Containers are configured using parameters passed at runtime (such as those abov
 | `-v /movies` | Location of Movie library on disk (See note in Application setup) |
 | `-v /downloads` | Location of download managers output directory (See note in Application setup) |
 | `--read-only=true` | Run container with a read-only filesystem. Please [read the docs](https://docs.linuxserver.io/misc/read-only/). |
+| `--user=1000:1000` | Run container with a non-root user. Please [read the docs](https://docs.linuxserver.io/misc/non-root/). |
 
 ## Environment variables from files (Docker secrets)
 
@@ -304,6 +309,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **12.12.24:** - Rebase to Alpine 3.21.
 * **25.05.24:** - Rebase to Alpine 3.20.
 * **20.03.24:** - Rebase to Alpine 3.19.
 * **06.06.23:** - Rebase nightly to Alpine 3.18.
diff --git a/readme-vars.yml b/readme-vars.yml
index 9a19d234..aebed264 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -30,6 +30,7 @@ param_usage_include_ports: true
 param_ports:
   - {external_port: "7878", internal_port: "7878", port_desc: "The port for the Radarr web UI"}
 readonly_supported: true
+nonroot_supported: true
 # application setup block
 app_setup_block_enabled: true
 app_setup_block: |
@@ -87,6 +88,7 @@ init_diagram: |
   "radarr:nightly" <- Base Images
 # changelog
 changelogs:
+  - {date: "12.12.24:", desc: "Rebase to Alpine 3.21."}
   - {date: "25.05.24:", desc: "Rebase to Alpine 3.20."}
   - {date: "20.03.24:", desc: "Rebase to Alpine 3.19."}
   - {date: "06.06.23:", desc: "Rebase nightly to Alpine 3.18."}
diff --git a/root/etc/s6-overlay/s6-rc.d/init-radarr-config/run b/root/etc/s6-overlay/s6-rc.d/init-radarr-config/run
index 00ce0681..14046743 100755
--- a/root/etc/s6-overlay/s6-rc.d/init-radarr-config/run
+++ b/root/etc/s6-overlay/s6-rc.d/init-radarr-config/run
@@ -3,7 +3,8 @@
 
 mkdir -p /run/radarr-temp
 
-# permissions
-lsiown -R abc:abc \
-    /config \
-    /run/radarr-temp
+if [[ -z ${LSIO_NON_ROOT_USER} ]]; then
+    lsiown -R abc:abc \
+        /config \
+        /run/radarr-temp
+fi
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-radarr/run b/root/etc/s6-overlay/s6-rc.d/svc-radarr/run
index 9737861d..0e8ac49b 100755
--- a/root/etc/s6-overlay/s6-rc.d/svc-radarr/run
+++ b/root/etc/s6-overlay/s6-rc.d/svc-radarr/run
@@ -1,7 +1,14 @@
 #!/usr/bin/with-contenv bash
 # shellcheck shell=bash
 
-exec \
-    s6-notifyoncheck -d -n 300 -w 1000 \
-        cd /app/radarr/bin s6-setuidgid abc /app/radarr/bin/Radarr \
-        -nobrowser -data=/config
+if [[ -n ${LSIO_NON_ROOT_USER} ]]; then
+    exec \
+        s6-notifyoncheck -d -n 300 -w 1000 \
+            cd /app/radarr/bin /app/radarr/bin/Radarr \
+            -nobrowser -data=/config
+else
+    exec \
+        s6-notifyoncheck -d -n 300 -w 1000 \
+            cd /app/radarr/bin s6-setuidgid abc /app/radarr/bin/Radarr \
+            -nobrowser -data=/config
+fi