diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 9262eb6..61503f4 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -23,13 +23,21 @@ RUN apt-get update -qq \
       libicu-dev \
       libpq-dev \
       vim \
+      ca-certificates \
+      curl \
+      gnupg \
     && apt-get clean \
     && rm -rf /var/cache/apt/archives/* \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
     && truncate -s 0 /var/log/*log
 
 # Installs yarn/nodejs as a dependency
-RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash - \
+RUN set -uex \
+    && mkdir -p /etc/apt/keyrings \
+    && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
+    && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main" > /etc/apt/sources.list.d/nodesource.list \
+    && apt-get update \
+    && apt-get install nodejs -y \
     && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg -o /root/yarn-pubkey.gpg && apt-key add /root/yarn-pubkey.gpg \
     && echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
     && apt-get update \
diff --git a/Dockerfile b/Dockerfile
index fc463ca..3542cce 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,8 +10,13 @@ SHELL ["/bin/bash", "-c"]
 # Use root user
 USER root
 
-ARG BUILD_PACKAGES="git libicu-dev libpq-dev nodejs npm"
-ARG BUILD_SCRIPT="curl -fsSL https://deb.nodesource.com/setup_16.x | bash - \
+ARG BUILD_PACKAGES="git libicu-dev libpq-dev ca-certificates curl gnupg"
+ARG BUILD_SCRIPT="set -uex \
+    && mkdir -p /etc/apt/keyrings \
+    && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
+    && echo \"deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main\" > /etc/apt/sources.list.d/nodesource.list \
+    && apt-get update \
+    && apt-get install nodejs -y \
     && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg -o /root/yarn-pubkey.gpg \
     && apt-key add /root/yarn-pubkey.gpg \
     && echo \"deb https://dl.yarnpkg.com/debian/ stable main\" > /etc/apt/sources.list.d/yarn.list \