diff --git a/gitea-runner/NodeLatestDockerfile b/gitea-runner/NodeLatestDockerfile
index dabdf6a..2c4c5b8 100644
--- a/gitea-runner/NodeLatestDockerfile
+++ b/gitea-runner/NodeLatestDockerfile
@@ -1,5 +1,14 @@
+# Latest official NodeJS image
+FROM node:latest-alpine AS node
+
 FROM docker:latest
 
+# Copy Node from the official docker image
+COPY --from=node /usr/lib /usr/lib
+COPY --from=node /usr/local/lib /usr/local/lib
+COPY --from=node /usr/local/include /usr/local/include
+COPY --from=node /usr/local/bin /usr/local/bin
+
 # Install packages
 RUN apk add --no-cache curl wget git bash
 
diff --git a/gitea-runner/NodeWithPnpmLatestDockerfile b/gitea-runner/NodeWithPnpmLatestDockerfile
index 4c545d3..e932981 100644
--- a/gitea-runner/NodeWithPnpmLatestDockerfile
+++ b/gitea-runner/NodeWithPnpmLatestDockerfile
@@ -1,10 +1,4 @@
-FROM docker:latest
-
-# Install packages
-RUN apk add --no-cache curl wget git bash
-
-# Install Node 18
-RUN apk add nodejs npm --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/main --allow-untrusted
+FROM fascinated/docker-images:node-latest
 
 # Install pnpm
 RUN npm install -g pnpm
\ No newline at end of file