diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index c877a6d6..61181b21 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,10 +1,9 @@
 # Bun doesn't run well on Musl but this seems to work
 FROM oven/bun:1.1.29-alpine as base
 
-RUN apk add --no-cache libstdc++ git=^2.0.0 bash^5.0.0 curl^8.0.0 openssh^9.7.0 cloc^2.0.0
-
 # Switch to Bash by editing /etc/passwd
-RUN sed -i -e 's|/bin/ash|/bin/bash|g' /etc/passwd
+RUN apk add --no-cache libstdc++ git=^2.0.0 bash^5.0.0 curl^8.0.0 openssh^9.7.0 cloc^2.0.0 &&
+    sed -i -e 's|/bin/ash|/bin/bash|g' /etc/passwd
 
 # Extract Node from its docker image (node:22-alpine)
 COPY --from=node:22-alpine /usr/local/bin/node /usr/local/bin/node
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index de444ef4..53770978 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -28,10 +28,10 @@ WORKDIR /temp/dist
 # Copy production dependencies and source code into final image
 FROM oven/bun:1.1.29-alpine
 
-RUN apk add --no-cache libstdc++^14.0.0
+# Install libstdc++ for Bun and create app directory
+RUN apk add --no-cache libstdc++^14.0.0 &&
+    mkdir -p /app
 
-# Create app directory
-RUN mkdir -p /app
 COPY --from=build /temp/dist /app/dist
 COPY entrypoint.sh /app