diff --git a/docker/prod/Dockerfile b/docker/prod/Dockerfile
index 37e0481bb..b6d03d56f 100644
--- a/docker/prod/Dockerfile
+++ b/docker/prod/Dockerfile
@@ -1,75 +1,98 @@
-FROM serversideup/php:8.2-fpm-nginx-v2.2.1 AS base
+# Versions
+# https://hub.docker.com/r/serversideup/php/tags?name=8.3-fpm-nginx-alpine
+ARG SERVERSIDEUP_PHP_VERSION=8.3-fpm-nginx-alpine
+# https://github.com/minio/mc/releases
+ARG MINIO_VERSION=RELEASE.2024-11-05T11-29-45Z
+# https://github.com/cloudflare/cloudflared/releases
+ARG CLOUDFLARED_VERSION=2024.11.0
+# https://www.postgresql.org/support/versioning/ - Can not be updated automatically so keep it at 15
+ARG POSTGRES_VERSION=15
+
+
+FROM serversideup/php:${SERVERSIDEUP_PHP_VERSION} AS base
+
 WORKDIR /var/www/html
 
-COPY composer.json composer.lock ./
+COPY --chown=www-data:www-data composer.json composer.lock ./
 RUN composer install --no-dev --no-interaction --no-plugins --no-scripts --prefer-dist
 
-FROM node:20 AS static-assets
+
+FROM node:20-alpine AS static-assets
 WORKDIR /app
 COPY . .
-COPY --from=base --chown=9999:9999 /var/www/html .
-RUN npm install
-RUN npm run build
+COPY --from=base --chown=www-data:www-data /var/www/html .
+RUN npm ci && \
+    npm run build
 
-FROM serversideup/php:8.2-fpm-nginx-v2.2.1
+
+FROM minio/mc:${MINIO_VERSION} AS minio-client
+
+FROM serversideup/php:${SERVERSIDEUP_PHP_VERSION}
 
 ARG TARGETPLATFORM
-# https://github.com/cloudflare/cloudflared/releases
-ARG CLOUDFLARED_VERSION=2024.4.1
-ARG POSTGRES_VERSION=15
+ARG POSTGRES_VERSION
+ARG CLOUDFLARED_VERSION
 ARG CI=true
 
 WORKDIR /var/www/html
 
-RUN apt-get update
-# Postgres version requirements
-RUN apt install dirmngr ca-certificates software-properties-common gnupg gnupg2 apt-transport-https curl -y
-RUN curl -fSsL https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | tee /usr/share/keyrings/postgresql.gpg > /dev/null
+USER root
 
-RUN echo deb [arch=amd64,arm64,ppc64el signed-by=/usr/share/keyrings/postgresql.gpg] http://apt.postgresql.org/pub/repos/apt/ jammy-pgdg main | tee -a /etc/apt/sources.list.d/postgresql.list
+# Install PostgreSQL repository and key
+RUN apk add --no-cache gnupg && \
+    mkdir -p /usr/share/keyrings && \
+    curl -fSsL https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor > /usr/share/keyrings/postgresql.gpg
 
-RUN apt-get update
-RUN apt-get install postgresql-client-$POSTGRES_VERSION -y
+# Install only required packages that aren't already in the base image
+RUN apk add --no-cache \
+    postgresql${POSTGRES_VERSION}-client \
+    openssh-client \
+    git \
+    git-lfs \
+    jq \
+    lsof
 
-# Coolify requirements
-RUN apt-get install -y php8.2-pgsql openssh-client git git-lfs jq lsof vim
-RUN apt-get -y autoremove && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
+# Configure shell aliases
+RUN echo "alias ll='ls -al'" >> /etc/profile && \
+    echo "alias a='php artisan'" >> /etc/profile && \
+    echo "alias logs='tail -f storage/logs/laravel.log'" >> /etc/profile
 
-COPY docker/prod/nginx.conf /etc/nginx/conf.d/custom.conf
+# Setup Cloudflared based on architecture
+RUN mkdir -p /usr/local/bin && \
+    if [ "${TARGETPLATFORM}" = "linux/amd64" ]; then \
+        curl -sSL "https://github.com/cloudflare/cloudflared/releases/download/${CLOUDFLARED_VERSION}/cloudflared-linux-amd64" -o /usr/local/bin/cloudflared; \
+    elif [ "${TARGETPLATFORM}" = "linux/arm64" ]; then \
+        curl -sSL "https://github.com/cloudflare/cloudflared/releases/download/${CLOUDFLARED_VERSION}/cloudflared-linux-arm64" -o /usr/local/bin/cloudflared; \
+    fi && \
+    chmod +x /usr/local/bin/cloudflared
 
-COPY --from=base --chown=9999:9999 /var/www/html .
+# Configure PHP upload limits
+RUN echo 'upload_max_filesize=256M' > /usr/local/etc/php/conf.d/upload-limits.ini && \
+    echo 'post_max_size=256M' >> /usr/local/etc/php/conf.d/upload-limits.ini
 
-COPY --chown=9999:9999 . .
+# Copy application files
+COPY --chown=www-data:www-data . .
+COPY --from=base --chown=www-data:www-data /var/www/html .
+COPY --from=static-assets --chown=www-data:www-data /app/public/build ./public/build
+
+# Add composer dump-autoload before artisan commands
 RUN composer dump-autoload
 
-COPY --from=static-assets --chown=9999:9999 /app/public/build ./public/build
+# Copy configuration files
+COPY docker/prod/nginx.conf /etc/nginx/conf.d/custom.conf
 COPY --chmod=755 docker/prod/etc/s6-overlay/ /etc/s6-overlay/
 
+# Install Minio client
+COPY --from=minio-client /usr/bin/mc /usr/bin/mc
+RUN chmod +x /usr/bin/mc
+
+# Optimize Laravel
+USER www-data
 RUN php artisan route:clear
 RUN php artisan view:clear
 RUN php artisan route:cache
 RUN php artisan view:cache
 
-RUN echo "alias ll='ls -al'" >>/etc/bash.bashrc
-RUN echo "alias a='php artisan'" >>/etc/bash.bashrc
-RUN echo "alias logs='tail -f storage/logs/laravel.log'" >>/etc/bash.bashrc
 
-RUN mkdir -p /usr/local/bin
-
-RUN /bin/bash -c "if [[ ${TARGETPLATFORM} == 'linux/amd64' ]]; then \
-    echo 'amd64' && \
-    curl -sSL https://github.com/cloudflare/cloudflared/releases/download/${CLOUDFLARED_VERSION}/cloudflared-linux-amd64 -o /usr/local/bin/cloudflared && chmod +x /usr/local/bin/cloudflared \
-    ;fi"
-
-RUN /bin/bash -c "if [[ ${TARGETPLATFORM} == 'linux/arm64' ]]; then \
-    echo 'arm64' && \
-    curl -L https://github.com/cloudflare/cloudflared/releases/download/${CLOUDFLARED_VERSION}/cloudflared-linux-arm64 -o /usr/local/bin/cloudflared && chmod +x /usr/local/bin/cloudflared \
-    ;fi"
-
-RUN { \
-    echo 'upload_max_filesize=256M'; \
-    echo 'post_max_size=256M'; \
-  } > /etc/php/current_version/cli/conf.d/upload-limits.ini
-
-COPY --from=minio/mc:RELEASE.2024-09-09T07-53-10Z /usr/bin/mc /usr/bin/mc
-RUN chmod +x /usr/bin/mc
+# Switch back to unprivileged user
+USER www-data