diff --git a/apache/Dockerfile b/apache/Dockerfile
index b0f1e1a..58c382d 100644
--- a/apache/Dockerfile
+++ b/apache/Dockerfile
@@ -138,7 +138,7 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/* \
     && rm -rf /tmp/*
 
-COPY files /
+COPY files/general /
 
 FROM runtime AS builder
 
@@ -241,6 +241,7 @@ ARG TARGETARCH
 ARG DEBIAN_FRONTEND=noninteractive
 
 ENV COREPACK_ENABLE_DOWNLOAD_PROMPT=0
+ENV npm_config_cache="$XDG_CACHE_HOME/npm"
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
diff --git a/files/etc/frankenphp/Caddyfile b/files/frankenphp/etc/Caddyfile
similarity index 100%
rename from files/etc/frankenphp/Caddyfile
rename to files/frankenphp/etc/Caddyfile
diff --git a/files/usr/local/etc/php/conf.d/010-default.ini b/files/general/usr/local/etc/php/conf.d/010-default.ini
similarity index 100%
rename from files/usr/local/etc/php/conf.d/010-default.ini
rename to files/general/usr/local/etc/php/conf.d/010-default.ini
diff --git a/fpm/Dockerfile b/fpm/Dockerfile
index e90c814..7dc2339 100644
--- a/fpm/Dockerfile
+++ b/fpm/Dockerfile
@@ -138,7 +138,7 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/* \
     && rm -rf /tmp/*
 
-COPY files /
+COPY files/general /
 
 FROM runtime AS builder
 
@@ -242,6 +242,7 @@ ARG TARGETARCH
 ARG DEBIAN_FRONTEND=noninteractive
 
 ENV COREPACK_ENABLE_DOWNLOAD_PROMPT=0
+ENV npm_config_cache="$XDG_CACHE_HOME/npm"
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
diff --git a/frankenphp/Dockerfile b/frankenphp/Dockerfile
index e44ea27..fe55e84 100644
--- a/frankenphp/Dockerfile
+++ b/frankenphp/Dockerfile
@@ -142,7 +142,8 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/* \
     && rm -rf /tmp/*
 
-COPY files /
+COPY files/general /
+COPY files/frankenphp /
 
 FROM runtime AS builder
 
@@ -245,6 +246,7 @@ ARG TARGETARCH
 ARG DEBIAN_FRONTEND=noninteractive
 
 ENV COREPACK_ENABLE_DOWNLOAD_PROMPT=0
+ENV npm_config_cache="$XDG_CACHE_HOME/npm"
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]