diff --git a/.dockerignore b/.dockerignore
index e599283..44255c7 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -5,4 +5,4 @@ vendor
 storage/*.key
 .env
 .phpunit.result.cache
-Docker/Dockerfile
+docker/Dockerfile
diff --git a/docker-compose.yml b/docker-compose.yml
index 07ef504..54aea1d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -23,6 +23,10 @@ services:
       DB_PASSWORD: ${DB_PASSWORD}
 
       FILESYSTEM_DISK: s3
+      AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID}
+      AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
+      AWS_DEFAULT_REGION: ${AWS_DEFAULT_REGION:-us-east-1}
+      AWS_BUCKET: ${AWS_BUCKET}
     depends_on:
       - db
 
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 2a70b87..66ef715 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,3 +1,10 @@
+FROM node:20-alpine AS node-builder
+WORKDIR /app
+COPY package.json package-lock.json ./
+RUN npm ci --ignore-scripts
+COPY . .
+RUN npm run build:icons && npm run build
+
 FROM composer:2.8 AS php-builder
 WORKDIR /app
 COPY composer*.json ./
@@ -28,6 +35,9 @@ RUN apk add --no-cache \
 COPY docker/opcache.ini /usr/local/etc/php/conf.d/opcache.ini
 
 COPY --from=php-builder /app /var/www/html
+COPY --from=node-builder /app/public/build /var/www/html/public/build
+
+RUN rm -rf /var/www/html/docker
 
 RUN ln -sf ../../storage/app/public /var/www/html/public/storage
 
diff --git a/docker/nginx.Dockerfile b/docker/nginx.Dockerfile
index a573ab9..97842a5 100644
--- a/docker/nginx.Dockerfile
+++ b/docker/nginx.Dockerfile
@@ -1,7 +1,7 @@
 FROM node:20-alpine AS node-builder
 WORKDIR /app
-COPY package.json ./
-RUN npm install --ignore-scripts
+COPY package.json package-lock.json ./
+RUN npm ci --ignore-scripts
 COPY . .
 RUN npm run build:icons && npm run build