diff --git a/Dockerfile b/Dockerfile
index 4fcd0fa..1962fbe 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,14 +19,15 @@ RUN \
   apk add -U --upgrade --no-cache \
     curl \
     jq \
-    php8-gd \
     php8-bz2 \
+    php8-curl \
+    php8-dom \
+    php8-gd \
+    php8-iconv \
     php8-mysqli \
     php8-opcache \
-    php8-iconv \
-    php8-dom \
+    php8-pecl-uploadprogress \
     php8-tokenizer \
-    php8-curl \
     php8-zip && \
   echo "**** configure php-fpm to pass env vars ****" && \
   sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php8/php-fpm.d/www.conf && \
@@ -79,11 +80,12 @@ RUN \
     /tmp/phpmyadmin.tar.xz -C \
     /app/www/public/ --strip-components=1 && \
   sed -i "s@'configFile' =>.*@'configFile' => '/config/phpmyadmin/config.inc.php',@" "/app/www/public/libraries/vendor_config.php" && \    
-  echo "**** cleanup ****" && \  
+  echo "**** cleanup ****" && \
   apk del --purge \
     build-dependencies && \
   rm -rf \
-    /tmp/*
+    /tmp/* \
+    /app/www/public/setup
 
 COPY root/ /
 
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 145bf0e..2946516 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -18,14 +18,15 @@ RUN \
   apk add -U --upgrade --no-cache \
     curl \
     jq \
-    php8-gd \
     php8-bz2 \
+    php8-curl \
+    php8-dom \
+    php8-gd \
+    php8-iconv \
     php8-mysqli \
     php8-opcache \
-    php8-iconv \
-    php8-dom \
+    php8-pecl-uploadprogress \
     php8-tokenizer \
-    php8-curl \
     php8-zip && \
   echo "**** configure php-fpm to pass env vars ****" && \
   sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php8/php-fpm.d/www.conf && \
@@ -82,7 +83,8 @@ RUN \
   apk del --purge \
     build-dependencies && \
   rm -rf \
-    /tmp/*
+    /tmp/* \
+    /app/www/public/setup
 
 COPY root/ /
 
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index b50938e..b02ede1 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -18,14 +18,15 @@ RUN \
   apk add -U --upgrade --no-cache \
     curl \
     jq \
-    php8-gd \
     php8-bz2 \
+    php8-curl \
+    php8-dom \
+    php8-gd \
+    php8-iconv \
     php8-mysqli \
     php8-opcache \
-    php8-iconv \
-    php8-dom \
+    php8-pecl-uploadprogress \
     php8-tokenizer \
-    php8-curl \
     php8-zip && \
   echo "**** configure php-fpm to pass env vars ****" && \
   sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php8/php-fpm.d/www.conf && \
@@ -82,7 +83,8 @@ RUN \
   apk del --purge \
     build-dependencies && \
   rm -rf \
-    /tmp/*
+    /tmp/* \
+    /app/www/public/setup
 
 COPY root/ /
 
diff --git a/root/defaults/config.inc.php b/root/defaults/config.inc.php
index dbf356e..c94aef8 100644
--- a/root/defaults/config.inc.php
+++ b/root/defaults/config.inc.php
@@ -1,5 +1,7 @@
 <?php
 
+// Sourced from https://github.com/phpmyadmin/docker/blob/master/config.inc.php
+
 require('/config/phpmyadmin/config.secret.inc.php');
 
 /* Ensure we got the environment */
diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample
index 70359ee..0b47d01 100644
--- a/root/defaults/nginx/site-confs/default.conf.sample
+++ b/root/defaults/nginx/site-confs/default.conf.sample
@@ -1,5 +1,12 @@
 ## Version 2022/08/20 - Changelog: https://github.com/linuxserver/docker-phpmyadmin/commits/main/root/defaults/nginx/site-confs/default.conf.sample
 
+map $sent_http_content_type $expires {
+    default         off;
+    ~js/            max;
+    ~themes/        max;
+    ~doc/           max;
+}
+
 server {
     listen 80 default_server;
     listen [::]:80 default_server;
@@ -10,26 +17,23 @@ server {
     server_name _;
 
     root /app/www/public;
-    index index.html index.htm index.php;
+    index index.php index.html;
 
     location / {
         # enable for basic auth
         #auth_basic "Restricted";
         #auth_basic_user_file /config/nginx/.htpasswd;
 
-        try_files $uri $uri/ /index.php$is_args$args;
-    }
+        expires $expires;
 
-    # set expiration of assets to MAX for caching
-    location ~* \.(ico|css|js)(\?[0-9]+)?$ {
-        expires max;
-        log_not_found off;
+        try_files $uri $uri/ /index.php$is_args$args;
     }
 
     location ~ ^(.+\.php)(.*)$ {
         fastcgi_split_path_info ^(.+\.php)(.*)$;
         fastcgi_pass 127.0.0.1:9000;
         fastcgi_index index.php;
+        fastcgi_read_timeout 3600;
         include /etc/nginx/fastcgi_params;
     }