diff --git a/.editorconfig b/.editorconfig
old mode 100755
new mode 100644
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/.github/workflows/permissions.yml b/.github/workflows/permissions.yml
old mode 100755
new mode 100644
diff --git a/Dockerfile b/Dockerfile
index 36b5947..83f8c20 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.21
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.22
 
 # set version label
 ARG BUILD_DATE
@@ -21,17 +21,17 @@ RUN \
     gpg-agent \
     gnupg-dirmngr && \
   apk add --no-cache \
-    php83-bz2 \
-    php83-dom \
-    php83-gd \
-    php83-mysqli \
-    php83-opcache \
-    php83-pecl-uploadprogress \
-    php83-tokenizer && \
+    php84-bz2 \
+    php84-dom \
+    php84-gd \
+    php84-mysqli \
+    php84-opcache \
+    php84-pecl-uploadprogress \
+    php84-tokenizer && \
   echo "**** configure php-fpm to pass env vars ****" && \
-  sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php83/php-fpm.d/www.conf && \
-  grep -qxF 'clear_env = no' /etc/php83/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php83/php-fpm.d/www.conf && \
-  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php83/php-fpm.conf && \
+  sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php84/php-fpm.d/www.conf && \
+  grep -qxF 'clear_env = no' /etc/php84/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php84/php-fpm.d/www.conf && \
+  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php84/php-fpm.conf && \
   echo "**** setup php opcache ****" && \
   { \
       echo 'opcache.memory_consumption=128'; \
@@ -39,12 +39,12 @@ RUN \
       echo 'opcache.max_accelerated_files=4000'; \
       echo 'opcache.revalidate_freq=2'; \
       echo 'opcache.fast_shutdown=1'; \
-  } > /etc/php83/conf.d/opcache-recommended.ini; \
+  } > /etc/php84/conf.d/opcache-recommended.ini; \
   \
   { \
       echo 'session.cookie_httponly=1'; \
       echo 'session.use_strict_mode=1'; \
-  } > /etc/php83/conf.d/session-strict.ini; \
+  } > /etc/php84/conf.d/session-strict.ini; \
   \
   { \
       echo 'allow_url_fopen=Off'; \
@@ -53,7 +53,7 @@ RUN \
       echo 'memory_limit=${MEMORY_LIMIT}'; \
       echo 'post_max_size=${UPLOAD_LIMIT}'; \
       echo 'upload_max_filesize=${UPLOAD_LIMIT}'; \
-  } > /etc/php83/conf.d/phpmyadmin-misc.ini && \
+  } > /etc/php84/conf.d/phpmyadmin-misc.ini && \
   echo "**** install phpmyadmin ****" && \
   mkdir -p /app/www/public && \
   if [ -z ${PHPMYADMIN_VERSION+x} ]; then \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index a501e4f..c3b6be2 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.21
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.22
 
 # set version label
 ARG BUILD_DATE
@@ -21,17 +21,17 @@ RUN \
     gpg-agent \
     gnupg-dirmngr && \
   apk add --no-cache \
-    php83-bz2 \
-    php83-dom \
-    php83-gd \
-    php83-mysqli \
-    php83-opcache \
-    php83-pecl-uploadprogress \
-    php83-tokenizer && \
+    php84-bz2 \
+    php84-dom \
+    php84-gd \
+    php84-mysqli \
+    php84-opcache \
+    php84-pecl-uploadprogress \
+    php84-tokenizer && \
   echo "**** configure php-fpm to pass env vars ****" && \
-  sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php83/php-fpm.d/www.conf && \
-  grep -qxF 'clear_env = no' /etc/php83/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php83/php-fpm.d/www.conf && \
-  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php83/php-fpm.conf && \
+  sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php84/php-fpm.d/www.conf && \
+  grep -qxF 'clear_env = no' /etc/php84/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php84/php-fpm.d/www.conf && \
+  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php84/php-fpm.conf && \
   echo "**** setup php opcache ****" && \
   { \
       echo 'opcache.memory_consumption=128'; \
@@ -39,12 +39,12 @@ RUN \
       echo 'opcache.max_accelerated_files=4000'; \
       echo 'opcache.revalidate_freq=2'; \
       echo 'opcache.fast_shutdown=1'; \
-  } > /etc/php83/conf.d/opcache-recommended.ini; \
+  } > /etc/php84/conf.d/opcache-recommended.ini; \
   \
   { \
       echo 'session.cookie_httponly=1'; \
       echo 'session.use_strict_mode=1'; \
-  } > /etc/php83/conf.d/session-strict.ini; \
+  } > /etc/php84/conf.d/session-strict.ini; \
   \
   { \
       echo 'allow_url_fopen=Off'; \
@@ -53,7 +53,7 @@ RUN \
       echo 'memory_limit=${MEMORY_LIMIT}'; \
       echo 'post_max_size=${UPLOAD_LIMIT}'; \
       echo 'upload_max_filesize=${UPLOAD_LIMIT}'; \
-  } > /etc/php83/conf.d/phpmyadmin-misc.ini && \
+  } > /etc/php84/conf.d/phpmyadmin-misc.ini && \
   echo "**** install phpmyadmin ****" && \
   mkdir -p /app/www/public && \
   if [ -z ${PHPMYADMIN_VERSION+x} ]; then \
diff --git a/README.md b/README.md
index 1a17531..1b18bc3 100644
--- a/README.md
+++ b/README.md
@@ -301,6 +301,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **05.07.25:** - Rebase to Alpine 3.22.
 * **19.12.24:** - Rebase to Alpine 3.21.
 * **27.05.24:** - Existing users should update their nginx confs to avoid http2 deprecation warnings.
 * **24.05.24:** - Rebase to Alpine 3.20.
diff --git a/readme-vars.yml b/readme-vars.yml
index 703ec23..63df876 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -95,6 +95,7 @@ init_diagram: |
   "phpmyadmin:latest" <- Base Images
 # changelog
 changelogs:
+  - {date: "05.07.25:", desc: "Rebase to Alpine 3.22."}
   - {date: "19.12.24:", desc: "Rebase to Alpine 3.21."}
   - {date: "27.05.24:", desc: "Existing users should update their nginx confs to avoid http2 deprecation warnings."}
   - {date: "24.05.24:", desc: "Rebase to Alpine 3.20."}