diff --git a/6/onbuild/Dockerfile b/6/onbuild/Dockerfile
index 17590205..23343a95 100644
--- a/6/onbuild/Dockerfile
+++ b/6/onbuild/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:6.14.2
+FROM node:6.14.2-jessie
 
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
diff --git a/8/onbuild/Dockerfile b/8/onbuild/Dockerfile
index 38e63fc6..5dae691f 100644
--- a/8/onbuild/Dockerfile
+++ b/8/onbuild/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:8.11.2
+FROM node:8.11.2-jessie
 
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
diff --git a/9/onbuild/Dockerfile b/9/onbuild/Dockerfile
index b04d80bd..ffac7135 100644
--- a/9/onbuild/Dockerfile
+++ b/9/onbuild/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:9.11.1
+FROM node:9.11.1-jessie
 
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
diff --git a/Dockerfile-onbuild.template b/Dockerfile-onbuild.template
index 59e58c9c..5697066c 100644
--- a/Dockerfile-onbuild.template
+++ b/Dockerfile-onbuild.template
@@ -1,4 +1,4 @@
-FROM node:0.0.0
+FROM node:0.0.0-jessie
 
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
diff --git a/update.sh b/update.sh
index 950fdbba..65d1867c 100755
--- a/update.sh
+++ b/update.sh
@@ -56,10 +56,15 @@ function update_node_version() {
       fromprefix="${arch}\\/"
     fi
 
-    sed -Ei -e 's/^FROM (.*)/FROM '"${fromprefix}"'\1/' "${dockerfile}"
-    sed -Ei -e 's/^(ENV NODE_VERSION |FROM .*node:).*/\1'"${version}.${fullVersion:-0}"'/' "${dockerfile}"
+    nodeVersion="${version}.${fullVersion:-0}"
+
+    sed -Ei -e 's/^FROM (.*)/FROM '"$fromprefix"'\1/' "${dockerfile}"
+    sed -Ei -e 's/^(ENV NODE_VERSION ).*/\1'"${nodeVersion}"'/' "${dockerfile}"
     sed -Ei -e 's/^(ENV YARN_VERSION ).*/\1'"${yarnVersion}"'/' "${dockerfile}"
 
+    # Only for onbuild variant
+    sed -Ei -e 's/^(FROM .*node:)[^-]*(-.*)/\1'"${nodeVersion}"'\2/' "${dockerfile}"
+
     # shellcheck disable=SC1004
     new_line=' \\\
 '