diff --git a/deployment/docker/ci/Dockerfile b/deployment/docker/ci/Dockerfile
index 78e443c7..1a365cbc 100644
--- a/deployment/docker/ci/Dockerfile
+++ b/deployment/docker/ci/Dockerfile
@@ -5,7 +5,7 @@ ENV SEMAPHORE_VERSION="development" SEMAPHORE_ARCH="linux_amd64" \
     APP_ROOT="/go/src/github.com/ansible-semaphore/semaphore/"
 
 # hadolint ignore=DL3013
-RUN apk add --no-cache sshpass git mysql-client python3 py3-pip py-openssl openssl ca-certificates curl curl-dev openssh-client tini nodejs nodejs-npm bash rsync && \
+RUN apk add --no-cache sshpass git mysql-client python3 py3-pip py-openssl openssl ca-certificates curl curl-dev openssh-client tini nodejs npm bash rsync && \
     apk --update add --virtual build-dependencies python3-dev libffi-dev openssl-dev build-base &&\
     rm -rf /var/cache/apk/*
 
diff --git a/deployment/docker/ci/Singularity b/deployment/docker/ci/Singularity
index 731cca9b..fb1d7b08 100644
--- a/deployment/docker/ci/Singularity
+++ b/deployment/docker/ci/Singularity
@@ -1,5 +1,5 @@
 Bootstrap: docker
-From: golang:1.16.3-alpine3.13
+From: golang:1.18.3-alpine3.16
 Stage: spython-base
 
 %setup
@@ -12,7 +12,7 @@ SEMAPHORE_CONFIG_PATH="${SEMAPHORE_CONFIG_PATH:-/etc/semaphore}"
 APP_ROOT="/mnt/"
 
 # hadolint ignore=DL3013
-apk add --no-cache sshpass git mysql-client python3 py3-pip py-openssl openssl ca-certificates curl curl-dev openssh-client tini nodejs nodejs-npm bash rsync && \
+apk add --no-cache sshpass git mysql-client python3 py3-pip py-openssl openssl ca-certificates curl curl-dev openssh-client tini nodejs npm bash rsync && \
 apk --update add --virtual build-dependencies python3-dev libffi-dev openssl-dev build-base &&\
 rm -rf /var/cache/apk/*
 
diff --git a/deployment/docker/dev/Dockerfile b/deployment/docker/dev/Dockerfile
index fc2dbeb2..07677ac8 100644
--- a/deployment/docker/dev/Dockerfile
+++ b/deployment/docker/dev/Dockerfile
@@ -5,7 +5,7 @@ ENV SEMAPHORE_VERSION="development" SEMAPHORE_ARCH="linux_amd64" \
     APP_ROOT="/go/src/github.com/ansible-semaphore/semaphore/"
 
 # hadolint ignore=DL3013
-RUN apk add --no-cache sshpass git mysql-client python3 py3-pip py-openssl openssl ca-certificates curl curl-dev openssh-client tini nodejs nodejs-npm bash rsync && \
+RUN apk add --no-cache sshpass git mysql-client python3 py3-pip py-openssl openssl ca-certificates curl curl-dev openssh-client tini nodejs npm bash rsync && \
     apk --update add --virtual build-dependencies python3-dev libffi-dev openssl-dev build-base &&\
     rm -rf /var/cache/apk/*