diff --git a/node/express/kubernetes/Application/Dockerfile b/node/express/kubernetes/Application/Dockerfile
index 1151060f0..0bba07d32 100644
--- a/node/express/kubernetes/Application/Dockerfile
+++ b/node/express/kubernetes/Application/Dockerfile
@@ -1,5 +1,6 @@
-FROM node:8-onbuild
-MAINTAINER Azure App Services Container Images <appsvc-images@microsoft.com>
+FROM node:8
+LABEL maintainer="Azure App Services Container Images <appsvc-images@microsoft.com>"
+
 ENV PORT 8080
 EXPOSE 8080
 
diff --git a/node/plain/kubernetes/Application/Dockerfile b/node/plain/kubernetes/Application/Dockerfile
index f512d3f0f..f3a578d00 100644
--- a/node/plain/kubernetes/Application/Dockerfile
+++ b/node/plain/kubernetes/Application/Dockerfile
@@ -1,6 +1,4 @@
-FROM node:8-onbuild
-
-# FROM node:6.9.3
+FROM node:8
 LABEL maintainer="Azure App Service Container Images <appsvc-images@microsoft.com>"
 
 # Create app directory
diff --git a/node/sail.js/kubernetes/Application/Dockerfile b/node/sail.js/kubernetes/Application/Dockerfile
index ca18e9a3c..389bb9c5f 100644
--- a/node/sail.js/kubernetes/Application/Dockerfile
+++ b/node/sail.js/kubernetes/Application/Dockerfile
@@ -1,6 +1,4 @@
-FROM node:8-onbuild
-
-# FROM node:6.9.3
+FROM node:8
 LABEL maintainer="Azure App Service Container Images <appsvc-images@microsoft.com>"
 
 # Create app directory