diff --git a/.gitea/workflows/release-images.yaml b/.gitea/workflows/release-images.yaml
index 9b17cb0..0031c7c 100644
--- a/.gitea/workflows/release-images.yaml
+++ b/.gitea/workflows/release-images.yaml
@@ -24,5 +24,10 @@ jobs:
     - name: Build and push docker
       run: |
         docker build . -t git.nanobyte.cz/$GITHUB_REPOSITORY_OWNER/nano-rust:latest -t git.nanobyte.cz/$GITHUB_REPOSITORY_OWNER/nano-rust:1.74.${{steps.git.outputs.short_hash}} && \
+        docker build . -f Dockerfile.nodejs -t git.nanobyte.cz/$GITHUB_REPOSITORY_OWNER/nano-rust-nodejs:latest \
+          -t git.nanobyte.cz/$GITHUB_REPOSITORY_OWNER/nano-rust-nodejs:1.74.${{steps.git.outputs.short_hash}} \
+          --build-arg BASE_IMAGE=git.nanobyte.cz/$GITHUB_REPOSITORY_OWNER/nano-rust:1.74.${{steps.git.outputs.short_hash}} &&\
         docker push git.nanobyte.cz/$GITHUB_REPOSITORY_OWNER/nano-rust:1.74.${{steps.git.outputs.short_hash}} && \
-        docker push git.nanobyte.cz/$GITHUB_REPOSITORY_OWNER/nano-rust:latest
+        docker push git.nanobyte.cz/$GITHUB_REPOSITORY_OWNER/nano-rust:latest && \
+        docker push git.nanobyte.cz/$GITHUB_REPOSITORY_OWNER/nano-rust-builder:1.74.${{steps.git.outputs.short_hash}} && \
+        docker push git.nanobyte.cz/$GITHUB_REPOSITORY_OWNER/nano-rust-builder:latest
diff --git a/Dockerfile.nodejs b/Dockerfile.nodejs
new file mode 100644
index 0000000..ddf2b8d
--- /dev/null
+++ b/Dockerfile.nodejs
@@ -0,0 +1,6 @@
+ARG BASE_IMAGE
+FROM $BASE_IMAGE
+RUN apt-get install -y ca-certificates curl gnupg
+RUN mkdir -p /etc/apt/keyrings && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
+RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_21.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
+RUN apt-get update && apt-get install -y nodejs && rm -rf /var/cache/apt*
diff --git a/cargo-nan.sh b/cargo-nan.sh
index 7ff0754..d2d2bfa 100755
--- a/cargo-nan.sh
+++ b/cargo-nan.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
 
 export CARGO_REGISTRIES_GITEA_NANOBYTE_CREDENTIAL_PROVIDER=cargo:token
-export CARGO_REGISTRIES_GITEA_NANOBYTE_TOKEN=$1
+export CARGO_REGISTRIES_GITEA_NANOBYTE_TOKEN="Bearer $1"
 export CARGO_REGISTRIES_GITEA_NANOBYTE_INDEX=sparse+https://git.nanobyte.cz/api/packages/nanobyte/cargo/
 
 export CARGO_REGISTRIES_GITEA_OVLACH_CREDENTIAL_PROVIDER=cargo:token
-export CARGO_REGISTRIES_GITEA_OVLACH_TOKEN=$1
+export CARGO_REGISTRIES_GITEA_OVLACH_TOKEN="Bearer $1"
 export CARGO_REGISTRIES_GITEA_OVLACH_INDEX=sparse+https://git.nanobyte.cz/api/packages/ovlach/cargo/
 
 shift