diff --git a/nodejs/12/Dockerfile b/nodejs/12/Dockerfile
index 6674021..7f3b4fb 100644
--- a/nodejs/12/Dockerfile
+++ b/nodejs/12/Dockerfile
@@ -26,7 +26,9 @@ LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io"
 LABEL org.opencontainers.image.source="https://github.com/tresthost/images"
 LABEL org.opencontainers.image.licenses=MIT
 
-RUN apk add --update --no-cache ca-certificates curl ffmpeg git openssl sqlite tar tzdata
+RUN apk add --update --no-cache ca-certificates curl ffmpeg git openssl sqlite tar tzdata \
+    && curl -L https://unpkg.com/@pnpm/self-installer | node \
+    && rm -rf /var/cache/apk/*
 
 RUN adduser -D -h /home/container container
 
@@ -34,11 +36,6 @@ USER container
 ENV USER=container HOME=/home/container
 WORKDIR /home/container
 
-RUN npm install -g pnpm
-
-USER root
-RUN curl -L https://unpkg.com/@pnpm/self-installer | node
-
 USER container
 
 CMD ["node"]
\ No newline at end of file
diff --git a/nodejs/14/Dockerfile b/nodejs/14/Dockerfile
index e503052..a55f313 100644
--- a/nodejs/14/Dockerfile
+++ b/nodejs/14/Dockerfile
@@ -26,7 +26,9 @@ LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io"
 LABEL org.opencontainers.image.source="https://github.com/tresthost/images"
 LABEL org.opencontainers.image.licenses=MIT
 
-RUN apk add --update --no-cache ca-certificates curl ffmpeg git openssl sqlite tar tzdata
+RUN apk add --update --no-cache ca-certificates curl ffmpeg git openssl sqlite tar tzdata \
+    && curl -L https://unpkg.com/@pnpm/self-installer | node \
+    && rm -rf /var/cache/apk/*
 
 RUN adduser -D -h /home/container container
 
@@ -34,11 +36,6 @@ USER container
 ENV USER=container HOME=/home/container
 WORKDIR /home/container
 
-RUN npm install -g pnpm
-
-USER root
-RUN curl -L https://unpkg.com/@pnpm/self-installer | node
-
 USER container
 
 CMD ["node"]
\ No newline at end of file
diff --git a/nodejs/15/Dockerfile b/nodejs/15/Dockerfile
index 11c1c1f..37dc755 100644
--- a/nodejs/15/Dockerfile
+++ b/nodejs/15/Dockerfile
@@ -26,7 +26,9 @@ LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io"
 LABEL org.opencontainers.image.source="https://github.com/tresthost/images"
 LABEL org.opencontainers.image.licenses=MIT
 
-RUN apk add --update --no-cache ca-certificates curl ffmpeg git openssl sqlite tar tzdata
+RUN apk add --update --no-cache ca-certificates curl ffmpeg git openssl sqlite tar tzdata \
+    && curl -L https://unpkg.com/@pnpm/self-installer | node \
+    && rm -rf /var/cache/apk/*
 
 RUN adduser -D -h /home/container container
 
@@ -34,11 +36,6 @@ USER container
 ENV USER=container HOME=/home/container
 WORKDIR /home/container
 
-RUN npm install -g pnpm
-
-USER root
-RUN curl -L https://unpkg.com/@pnpm/self-installer | node
-
 USER container
 
 CMD ["node"]
\ No newline at end of file
diff --git a/nodejs/16/Dockerfile b/nodejs/16/Dockerfile
index 2c77aed..a4a238f 100644
--- a/nodejs/16/Dockerfile
+++ b/nodejs/16/Dockerfile
@@ -26,7 +26,9 @@ LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io"
 LABEL org.opencontainers.image.source="https://github.com/tresthost/images"
 LABEL org.opencontainers.image.licenses=MIT
 
-RUN apk add --update --no-cache ca-certificates curl ffmpeg git openssl sqlite tar tzdata
+RUN apk add --update --no-cache ca-certificates curl ffmpeg git openssl sqlite tar tzdata \
+    && curl -L https://unpkg.com/@pnpm/self-installer | node \
+    && rm -rf /var/cache/apk/*
 
 RUN adduser -D -h /home/container container
 
@@ -34,11 +36,6 @@ USER container
 ENV USER=container HOME=/home/container
 WORKDIR /home/container
 
-RUN npm install -g pnpm
-
-USER root
-RUN curl -L https://unpkg.com/@pnpm/self-installer | node
-
 USER container
 
 CMD ["node"]
\ No newline at end of file
diff --git a/nodejs/17/Dockerfile b/nodejs/17/Dockerfile
index a423120..9213620 100644
--- a/nodejs/17/Dockerfile
+++ b/nodejs/17/Dockerfile
@@ -26,7 +26,9 @@ LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io"
 LABEL org.opencontainers.image.source="https://github.com/tresthost/images"
 LABEL org.opencontainers.image.licenses=MIT
 
-RUN apk add --update --no-cache ca-certificates curl ffmpeg git openssl sqlite tar tzdata
+RUN apk add --update --no-cache ca-certificates curl ffmpeg git openssl sqlite tar tzdata \
+    && curl -L https://unpkg.com/@pnpm/self-installer | node \
+    && rm -rf /var/cache/apk/*
 
 RUN adduser -D -h /home/container container
 
@@ -34,11 +36,6 @@ USER container
 ENV USER=container HOME=/home/container
 WORKDIR /home/container
 
-RUN npm install -g pnpm
-
-USER root
-RUN curl -L https://unpkg.com/@pnpm/self-installer | node
-
 USER container
 
 CMD ["node"]
\ No newline at end of file
diff --git a/nodejs/18/Dockerfile b/nodejs/18/Dockerfile
index 5764ed3..1a6f966 100644
--- a/nodejs/18/Dockerfile
+++ b/nodejs/18/Dockerfile
@@ -26,7 +26,9 @@ LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io"
 LABEL org.opencontainers.image.source="https://github.com/tresthost/images"
 LABEL org.opencontainers.image.licenses=MIT
 
-RUN apk add --update --no-cache ca-certificates curl ffmpeg git openssl sqlite tar tzdata
+RUN apk add --update --no-cache ca-certificates curl ffmpeg git openssl sqlite tar tzdata \
+    && curl -L https://unpkg.com/@pnpm/self-installer | node \
+    && rm -rf /var/cache/apk/*
 
 RUN adduser -D -h /home/container container
 
@@ -34,11 +36,6 @@ USER container
 ENV USER=container HOME=/home/container
 WORKDIR /home/container
 
-RUN npm install -g pnpm
-
-USER root
-RUN curl -L https://unpkg.com/@pnpm/self-installer | node
-
 USER container
 
 CMD ["node"]
\ No newline at end of file
diff --git a/nodejs/19/Dockerfile b/nodejs/19/Dockerfile
index c73731a..3dc6213 100644
--- a/nodejs/19/Dockerfile
+++ b/nodejs/19/Dockerfile
@@ -26,7 +26,9 @@ LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io"
 LABEL org.opencontainers.image.source="https://github.com/tresthost/images"
 LABEL org.opencontainers.image.licenses=MIT
 
-RUN apk add --update --no-cache ca-certificates curl ffmpeg git openssl sqlite tar tzdata
+RUN apk add --update --no-cache ca-certificates curl ffmpeg git openssl sqlite tar tzdata \
+    && curl -L https://unpkg.com/@pnpm/self-installer | node \
+    && rm -rf /var/cache/apk/*
 
 RUN adduser -D -h /home/container container
 
@@ -34,11 +36,6 @@ USER container
 ENV USER=container HOME=/home/container
 WORKDIR /home/container
 
-RUN npm install -g pnpm
-
-USER root
-RUN curl -L https://unpkg.com/@pnpm/self-installer | node
-
 USER container
 
 CMD ["node"]
\ No newline at end of file
diff --git a/nodejs/20/Dockerfile b/nodejs/20/Dockerfile
index bdc2577..f2df478 100644
--- a/nodejs/20/Dockerfile
+++ b/nodejs/20/Dockerfile
@@ -26,7 +26,9 @@ LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io"
 LABEL org.opencontainers.image.source="https://github.com/tresthost/images"
 LABEL org.opencontainers.image.licenses=MIT
 
-RUN apk add --update --no-cache ca-certificates curl ffmpeg git openssl sqlite tar tzdata
+RUN apk add --update --no-cache ca-certificates curl ffmpeg git openssl sqlite tar tzdata \
+    && curl -L https://unpkg.com/@pnpm/self-installer | node \
+    && rm -rf /var/cache/apk/*
 
 RUN adduser -D -h /home/container container
 
@@ -34,11 +36,6 @@ USER container
 ENV USER=container HOME=/home/container
 WORKDIR /home/container
 
-RUN npm install -g pnpm
-
-USER root
-RUN curl -L https://unpkg.com/@pnpm/self-installer | node
-
 USER container
 
 CMD ["node"]
\ No newline at end of file
diff --git a/nodejs/entrypoint.sh b/nodejs/entrypoint.sh
index de5fab6..8fd096f 100644
--- a/nodejs/entrypoint.sh
+++ b/nodejs/entrypoint.sh
@@ -34,7 +34,7 @@ export INTERNAL_IP
 cd /home/container || exit 1
 
 # Print Node.js version
-printf "\033[1m\033[33mcontainer@tresthost~ \033[0mnode -v\n"
+printf "\033[1m\033[33mcontainer@pterodactyl~ \033[0mnode -v\n"
 node -v
 
 # Convert all of the "{{VARIABLE}}" parts of the command into the expected shell
@@ -44,6 +44,6 @@ PARSED=$(echo "${STARTUP}" | sed -e 's/{{/${/g' -e 's/}}/}/g' | eval echo "$(cat
 
 # Display the command we're running in the output, and then execute it with the env
 # from the container itself.
-printf "\033[1m\033[33mcontainer@tresthost~ \033[0m%s\n" "$PARSED"
+printf "\033[1m\033[33mcontainer@pterodactyl~ \033[0m%s\n" "$PARSED"
 # shellcheck disable=SC2086
 exec env ${PARSED}
\ No newline at end of file