diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile
index 0014944cbc..e94f4b8df0 100644
--- a/10/alpine/Dockerfile
+++ b/10/alpine/Dockerfile
@@ -68,4 +68,7 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
   && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
   && apk del .build-deps-yarn
 
+COPY docker-entrypoint.sh /usr/local/bin/
+ENTRYPOINT ["docker-entrypoint.sh"]
+
 CMD [ "node" ]
diff --git a/10/alpine/docker-entrypoint.sh b/10/alpine/docker-entrypoint.sh
new file mode 100755
index 0000000000..de6fa8a9ad
--- /dev/null
+++ b/10/alpine/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then
+  set -- node "$@"
+fi
+
+exec "$@"
diff --git a/10/jessie-slim/Dockerfile b/10/jessie-slim/Dockerfile
index 5068328697..d1c4ae2725 100644
--- a/10/jessie-slim/Dockerfile
+++ b/10/jessie-slim/Dockerfile
@@ -64,4 +64,7 @@ RUN set -ex \
   && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
   && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz
 
+COPY docker-entrypoint.sh /usr/local/bin/
+ENTRYPOINT ["docker-entrypoint.sh"]
+
 CMD [ "node" ]
diff --git a/10/jessie-slim/docker-entrypoint.sh b/10/jessie-slim/docker-entrypoint.sh
new file mode 100755
index 0000000000..de6fa8a9ad
--- /dev/null
+++ b/10/jessie-slim/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then
+  set -- node "$@"
+fi
+
+exec "$@"
diff --git a/10/jessie/Dockerfile b/10/jessie/Dockerfile
index d8a97562a7..ce6c00246d 100644
--- a/10/jessie/Dockerfile
+++ b/10/jessie/Dockerfile
@@ -61,4 +61,7 @@ RUN set -ex \
   && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
   && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz
 
+COPY docker-entrypoint.sh /usr/local/bin/
+ENTRYPOINT ["docker-entrypoint.sh"]
+
 CMD [ "node" ]
diff --git a/10/jessie/docker-entrypoint.sh b/10/jessie/docker-entrypoint.sh
new file mode 100755
index 0000000000..de6fa8a9ad
--- /dev/null
+++ b/10/jessie/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then
+  set -- node "$@"
+fi
+
+exec "$@"
diff --git a/10/stretch-slim/Dockerfile b/10/stretch-slim/Dockerfile
index 488f3f464b..eeb1c4119f 100644
--- a/10/stretch-slim/Dockerfile
+++ b/10/stretch-slim/Dockerfile
@@ -64,4 +64,7 @@ RUN set -ex \
   && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
   && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz
 
+COPY docker-entrypoint.sh /usr/local/bin/
+ENTRYPOINT ["docker-entrypoint.sh"]
+
 CMD [ "node" ]
diff --git a/10/stretch-slim/docker-entrypoint.sh b/10/stretch-slim/docker-entrypoint.sh
new file mode 100755
index 0000000000..de6fa8a9ad
--- /dev/null
+++ b/10/stretch-slim/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then
+  set -- node "$@"
+fi
+
+exec "$@"
diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile
index a7f7ead531..8f9fdcc69f 100644
--- a/10/stretch/Dockerfile
+++ b/10/stretch/Dockerfile
@@ -61,4 +61,7 @@ RUN set -ex \
   && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
   && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz
 
+COPY docker-entrypoint.sh /usr/local/bin/
+ENTRYPOINT ["docker-entrypoint.sh"]
+
 CMD [ "node" ]
diff --git a/10/stretch/docker-entrypoint.sh b/10/stretch/docker-entrypoint.sh
new file mode 100755
index 0000000000..de6fa8a9ad
--- /dev/null
+++ b/10/stretch/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then
+  set -- node "$@"
+fi
+
+exec "$@"
diff --git a/11/alpine/Dockerfile b/11/alpine/Dockerfile
index 710865233b..dff7d11781 100644
--- a/11/alpine/Dockerfile
+++ b/11/alpine/Dockerfile
@@ -68,4 +68,7 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
   && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
   && apk del .build-deps-yarn
 
+COPY docker-entrypoint.sh /usr/local/bin/
+ENTRYPOINT ["docker-entrypoint.sh"]
+
 CMD [ "node" ]
diff --git a/11/alpine/docker-entrypoint.sh b/11/alpine/docker-entrypoint.sh
new file mode 100755
index 0000000000..de6fa8a9ad
--- /dev/null
+++ b/11/alpine/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then
+  set -- node "$@"
+fi
+
+exec "$@"
diff --git a/11/stretch-slim/Dockerfile b/11/stretch-slim/Dockerfile
index 32200c11a3..2a390a92e6 100644
--- a/11/stretch-slim/Dockerfile
+++ b/11/stretch-slim/Dockerfile
@@ -64,4 +64,7 @@ RUN set -ex \
   && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
   && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz
 
+COPY docker-entrypoint.sh /usr/local/bin/
+ENTRYPOINT ["docker-entrypoint.sh"]
+
 CMD [ "node" ]
diff --git a/11/stretch-slim/docker-entrypoint.sh b/11/stretch-slim/docker-entrypoint.sh
new file mode 100755
index 0000000000..de6fa8a9ad
--- /dev/null
+++ b/11/stretch-slim/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then
+  set -- node "$@"
+fi
+
+exec "$@"
diff --git a/11/stretch/Dockerfile b/11/stretch/Dockerfile
index 5c3a293b41..68a39b8af4 100644
--- a/11/stretch/Dockerfile
+++ b/11/stretch/Dockerfile
@@ -61,4 +61,7 @@ RUN set -ex \
   && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
   && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz
 
+COPY docker-entrypoint.sh /usr/local/bin/
+ENTRYPOINT ["docker-entrypoint.sh"]
+
 CMD [ "node" ]
diff --git a/11/stretch/docker-entrypoint.sh b/11/stretch/docker-entrypoint.sh
new file mode 100755
index 0000000000..de6fa8a9ad
--- /dev/null
+++ b/11/stretch/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then
+  set -- node "$@"
+fi
+
+exec "$@"
diff --git a/12/alpine/Dockerfile b/12/alpine/Dockerfile
index 1a3ebdf9b7..6137c197f1 100644
--- a/12/alpine/Dockerfile
+++ b/12/alpine/Dockerfile
@@ -68,4 +68,7 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
   && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
   && apk del .build-deps-yarn
 
+COPY docker-entrypoint.sh /usr/local/bin/
+ENTRYPOINT ["docker-entrypoint.sh"]
+
 CMD [ "node" ]
diff --git a/12/alpine/docker-entrypoint.sh b/12/alpine/docker-entrypoint.sh
new file mode 100755
index 0000000000..de6fa8a9ad
--- /dev/null
+++ b/12/alpine/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then
+  set -- node "$@"
+fi
+
+exec "$@"
diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile
index 4cd6189798..f6e1881b5c 100644
--- a/12/stretch-slim/Dockerfile
+++ b/12/stretch-slim/Dockerfile
@@ -64,4 +64,7 @@ RUN set -ex \
   && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
   && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz
 
+COPY docker-entrypoint.sh /usr/local/bin/
+ENTRYPOINT ["docker-entrypoint.sh"]
+
 CMD [ "node" ]
diff --git a/12/stretch-slim/docker-entrypoint.sh b/12/stretch-slim/docker-entrypoint.sh
new file mode 100755
index 0000000000..de6fa8a9ad
--- /dev/null
+++ b/12/stretch-slim/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then
+  set -- node "$@"
+fi
+
+exec "$@"
diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile
index bd6da86666..dd9cb2b057 100644
--- a/12/stretch/Dockerfile
+++ b/12/stretch/Dockerfile
@@ -61,4 +61,7 @@ RUN set -ex \
   && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
   && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz
 
+COPY docker-entrypoint.sh /usr/local/bin/
+ENTRYPOINT ["docker-entrypoint.sh"]
+
 CMD [ "node" ]
diff --git a/12/stretch/docker-entrypoint.sh b/12/stretch/docker-entrypoint.sh
new file mode 100755
index 0000000000..de6fa8a9ad
--- /dev/null
+++ b/12/stretch/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then
+  set -- node "$@"
+fi
+
+exec "$@"
diff --git a/8/alpine/Dockerfile b/8/alpine/Dockerfile
index 336034477f..d74f387f46 100644
--- a/8/alpine/Dockerfile
+++ b/8/alpine/Dockerfile
@@ -68,4 +68,7 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
   && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
   && apk del .build-deps-yarn
 
+COPY docker-entrypoint.sh /usr/local/bin/
+ENTRYPOINT ["docker-entrypoint.sh"]
+
 CMD [ "node" ]
diff --git a/8/alpine/docker-entrypoint.sh b/8/alpine/docker-entrypoint.sh
new file mode 100755
index 0000000000..de6fa8a9ad
--- /dev/null
+++ b/8/alpine/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then
+  set -- node "$@"
+fi
+
+exec "$@"
diff --git a/8/jessie-slim/Dockerfile b/8/jessie-slim/Dockerfile
index 8cb11fc99a..11d3331325 100644
--- a/8/jessie-slim/Dockerfile
+++ b/8/jessie-slim/Dockerfile
@@ -64,4 +64,7 @@ RUN set -ex \
   && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
   && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz
 
+COPY docker-entrypoint.sh /usr/local/bin/
+ENTRYPOINT ["docker-entrypoint.sh"]
+
 CMD [ "node" ]
diff --git a/8/jessie-slim/docker-entrypoint.sh b/8/jessie-slim/docker-entrypoint.sh
new file mode 100755
index 0000000000..de6fa8a9ad
--- /dev/null
+++ b/8/jessie-slim/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then
+  set -- node "$@"
+fi
+
+exec "$@"
diff --git a/8/jessie/Dockerfile b/8/jessie/Dockerfile
index 22b27e514c..20ad522dcf 100644
--- a/8/jessie/Dockerfile
+++ b/8/jessie/Dockerfile
@@ -61,4 +61,7 @@ RUN set -ex \
   && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
   && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz
 
+COPY docker-entrypoint.sh /usr/local/bin/
+ENTRYPOINT ["docker-entrypoint.sh"]
+
 CMD [ "node" ]
diff --git a/8/jessie/docker-entrypoint.sh b/8/jessie/docker-entrypoint.sh
new file mode 100755
index 0000000000..de6fa8a9ad
--- /dev/null
+++ b/8/jessie/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then
+  set -- node "$@"
+fi
+
+exec "$@"
diff --git a/8/stretch-slim/Dockerfile b/8/stretch-slim/Dockerfile
index 6443cbbc21..6518417c86 100644
--- a/8/stretch-slim/Dockerfile
+++ b/8/stretch-slim/Dockerfile
@@ -64,4 +64,7 @@ RUN set -ex \
   && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
   && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz
 
+COPY docker-entrypoint.sh /usr/local/bin/
+ENTRYPOINT ["docker-entrypoint.sh"]
+
 CMD [ "node" ]
diff --git a/8/stretch-slim/docker-entrypoint.sh b/8/stretch-slim/docker-entrypoint.sh
new file mode 100755
index 0000000000..de6fa8a9ad
--- /dev/null
+++ b/8/stretch-slim/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then
+  set -- node "$@"
+fi
+
+exec "$@"
diff --git a/8/stretch/Dockerfile b/8/stretch/Dockerfile
index 48d0792646..993bc50800 100644
--- a/8/stretch/Dockerfile
+++ b/8/stretch/Dockerfile
@@ -61,4 +61,7 @@ RUN set -ex \
   && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
   && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz
 
+COPY docker-entrypoint.sh /usr/local/bin/
+ENTRYPOINT ["docker-entrypoint.sh"]
+
 CMD [ "node" ]
diff --git a/8/stretch/docker-entrypoint.sh b/8/stretch/docker-entrypoint.sh
new file mode 100755
index 0000000000..de6fa8a9ad
--- /dev/null
+++ b/8/stretch/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then
+  set -- node "$@"
+fi
+
+exec "$@"
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index 69cb25d9c0..36d281b2be 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -58,4 +58,7 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
   && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
   && apk del .build-deps-yarn
 
+COPY docker-entrypoint.sh /usr/local/bin/
+ENTRYPOINT ["docker-entrypoint.sh"]
+
 CMD [ "node" ]
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index 425b982f27..13ec6404b3 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -51,4 +51,7 @@ RUN set -ex \
   && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
   && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz
 
+COPY docker-entrypoint.sh /usr/local/bin/
+ENTRYPOINT ["docker-entrypoint.sh"]
+
 CMD [ "node" ]
diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template
index bed6237ca9..89de397259 100644
--- a/Dockerfile-slim.template
+++ b/Dockerfile-slim.template
@@ -54,4 +54,7 @@ RUN set -ex \
   && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
   && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz
 
+COPY docker-entrypoint.sh /usr/local/bin/
+ENTRYPOINT ["docker-entrypoint.sh"]
+
 CMD [ "node" ]
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
new file mode 100755
index 0000000000..de6fa8a9ad
--- /dev/null
+++ b/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then
+  set -- node "$@"
+fi
+
+exec "$@"
diff --git a/update.sh b/update.sh
index 5565383ebd..c10f685e0a 100755
--- a/update.sh
+++ b/update.sh
@@ -245,6 +245,7 @@ for version in "${versions[@]}"; do
       template_file="${parentpath}/Dockerfile-slim.template"
     fi
 
+    [ "$variant" != "onbuild" ] && cp "${parentpath}/docker-entrypoint.sh" "${version}/${variant}/docker-entrypoint.sh"
     if [ "${update_version}" -eq 0 ] && [ "${update_variant}" -eq 0 ]; then
       update_node_version "${baseuri}" "${versionnum}" "${template_file}" "${version}/${variant}/Dockerfile" "${variant}" &
     fi