diff --git a/Dockerfile b/Dockerfile
index 83807dd63..749da4695 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ FROM alpine:3.18 as build
 WORKDIR /iceshrimp
 
 # Install compilation dependencies
-RUN apk add --no-cache --no-progress git alpine-sdk vips-dev python3 nodejs-current npm vips
+RUN apk add --no-cache --no-progress git alpine-sdk vips-dev python3 nodejs-current npm vips moreutils jq
 
 # Copy only the dependency-related files first, to cache efficiently
 COPY package.json yarn.lock .pnp.cjs .pnp.loader.mjs ./
@@ -17,7 +17,7 @@ COPY packages/iceshrimp-js/package.json packages/iceshrimp-js/package.json
 COPY .yarn/cache .yarn/cache
 RUN --mount=type=cache,target=/iceshrimp/.yarncache cp -Tr .yarncache .yarn
 
-# Configure corepack and yarn, and install dev mode dependencies for compilation
+# Configure corepack and install dev mode dependencies for compilation
 RUN corepack enable && corepack prepare --activate && yarn
 
 # Save yarn cache
@@ -29,6 +29,16 @@ COPY . ./
 # Build the thing
 RUN env NODE_ENV=production yarn build
 
+# Prepare focused yarn cache
+RUN --mount=type=cache,target=/iceshrimp/.yarncache_focused cp -Tr .yarncache_focused .yarn
+
+# Remove dev deps
+RUN find packages package.json -name package.json | xargs -i sh -c "jq 'del(.devDependencies)' {} | sponge {}"
+RUN yarn
+
+# Save focused yarn cache
+RUN --mount=type=cache,target=/iceshrimp/.yarncache_focused rm -rf .yarncache/* && cp -Tr .yarn .yarncache_focused
+
 ## Runtime container
 FROM alpine:3.18
 WORKDIR /iceshrimp
@@ -36,17 +46,12 @@ WORKDIR /iceshrimp
 # Install runtime dependencies
 RUN apk add --no-cache --no-progress tini ffmpeg vips-dev zip unzip nodejs-current
 
-COPY . ./
-
-# Copy node modules
-COPY --from=build /iceshrimp/.yarn /iceshrimp/.yarn
-
-# Copy the finished compiled files
-COPY --from=build /iceshrimp/built /iceshrimp/built
-COPY --from=build /iceshrimp/packages/backend/built /iceshrimp/packages/backend/built
-COPY --from=build /iceshrimp/packages/backend/assets/instance.css /iceshrimp/packages/backend/assets/instance.css
+# Copy built files
+COPY --from=build /iceshrimp /iceshrimp
 
+# Configure corepack
 RUN corepack enable && corepack prepare --activate
+
 ENV NODE_ENV=production
 VOLUME "/iceshrimp/files"
 ENTRYPOINT [ "/sbin/tini", "--" ]