diff --git a/.github/ISSUE_TEMPLATE/issue.bug.yml b/.github/ISSUE_TEMPLATE/issue.bug.yml
old mode 100755
new mode 100644
diff --git a/.github/ISSUE_TEMPLATE/issue.feature.yml b/.github/ISSUE_TEMPLATE/issue.feature.yml
old mode 100755
new mode 100644
diff --git a/.github/workflows/call_issue_pr_tracker.yml b/.github/workflows/call_issue_pr_tracker.yml
old mode 100755
new mode 100644
diff --git a/.github/workflows/call_issues_cron.yml b/.github/workflows/call_issues_cron.yml
old mode 100755
new mode 100644
diff --git a/Dockerfile b/Dockerfile
index 6f5491a..6269fe8 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 272d0d5..5faaf10 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/Jenkinsfile b/Jenkinsfile
index fe09a71..012e61f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -36,7 +36,7 @@ pipeline {
     CI_PORT=''
     CI_SSL='false'
     CI_DELAY='120'
-    CI_DOCKERENV='TEST_RUN=1'
+    CI_DOCKERENV=''
     CI_AUTH=''
     CI_WEBPATH=''
   }
diff --git a/README.md b/README.md
index 3b906d2..f156233 100644
--- a/README.md
+++ b/README.md
@@ -74,6 +74,10 @@ Review and adjust any [Optional Settings](https://github.com/kiranshila/Doplarr#
 
 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.
@@ -176,6 +180,7 @@ Containers are configured using parameters passed at runtime (such as those abov
 | `-e JAVA_OPTS=` | For passing additional java options. |
 | `-v /config` | Persistent config files |
 | `--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)
 
@@ -339,6 +344,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **27.01.25:** - Rebase to Alpine 3.21.
 * **24.06.24:** - Rebase to Alpine 3.20.
 * **23.12.23:** - Rebase to Alpine 3.19.
 * **25.05.23:** - Rebase to Alpine 3.18.
diff --git a/jenkins-vars.yml b/jenkins-vars.yml
index b986518..c4253b3 100644
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -24,7 +24,7 @@ repo_vars:
   - CI_PORT=''
   - CI_SSL='false'
   - CI_DELAY='120'
-  - CI_DOCKERENV='TEST_RUN=1'
+  - CI_DOCKERENV=''
   - CI_AUTH=''
   - CI_WEBPATH=''
 sponsor_links:
diff --git a/readme-vars.yml b/readme-vars.yml
index ebd8304..3d10704 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -42,6 +42,7 @@ opt_param_env_vars:
   - {env_var: "LOG_LEVEL", env_value: ":info", desc: "The log level for the logging backend. This can be changed for debugging purposes. One of trace `:debug` `:info` `:warn` `:error` `:fatal` `:report`"}
   - {env_var: "JAVA_OPTS", env_value: "", desc: "For passing additional java options."}
 readonly_supported: true
+nonroot_supported: true
 # application setup block
 app_setup_block_enabled: true
 app_setup_block: |
@@ -100,6 +101,7 @@ init_diagram: |
   "doplarr:latest" <- Base Images
 # changelog
 changelogs:
+  - {date: "27.01.25:", desc: "Rebase to Alpine 3.21."}
   - {date: "24.06.24:", desc: "Rebase to Alpine 3.20."}
   - {date: "23.12.23:", desc: "Rebase to Alpine 3.19."}
   - {date: "25.05.23:", desc: "Rebase to Alpine 3.18."}
diff --git a/root/etc/s6-overlay/s6-rc.d/init-doplarr-config/run b/root/etc/s6-overlay/s6-rc.d/init-doplarr-config/run
index d7be1d9..cdb435c 100755
--- a/root/etc/s6-overlay/s6-rc.d/init-doplarr-config/run
+++ b/root/etc/s6-overlay/s6-rc.d/init-doplarr-config/run
@@ -5,6 +5,8 @@
 mkdir -p \
     /config
 
-# permissions
-lsiown -R abc:abc \
-    /config
+if [[ -z ${LSIO_NON_ROOT_USER} ]]; then
+    # permissions
+    lsiown -R abc:abc \
+        /config
+fi
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-doplarr/run b/root/etc/s6-overlay/s6-rc.d/svc-doplarr/run
index fc7fe86..321297c 100755
--- a/root/etc/s6-overlay/s6-rc.d/svc-doplarr/run
+++ b/root/etc/s6-overlay/s6-rc.d/svc-doplarr/run
@@ -21,7 +21,14 @@ IFS=" " read -r -a RUN_ARRAY <<<"${JAVA_OPTS}"
 
 cd /app/doplarr/bin || exit
 
-exec \
-    s6-setuidgid abc java \
-    "${RUN_ARRAY[@]}" \
-    -jar /app/doplarr/bin/doplarr.jar
+if [[ -z ${LSIO_NON_ROOT_USER} ]]; then
+    exec \
+        s6-setuidgid abc java \
+        "${RUN_ARRAY[@]}" \
+        -jar /app/doplarr/bin/doplarr.jar
+else
+    exec \
+        java \
+        "${RUN_ARRAY[@]}" \
+        -jar /app/doplarr/bin/doplarr.jar
+fi