diff --git a/bitnami/node/6/.dockerignore b/bitnami/node/6/.dockerignore
new file mode 100644
index 000000000000..2d2ecd68da83
--- /dev/null
+++ b/bitnami/node/6/.dockerignore
@@ -0,0 +1 @@
+.git/
diff --git a/bitnami/node/6/Dockerfile b/bitnami/node/6/Dockerfile
new file mode 100644
index 000000000000..fee69e87ec14
--- /dev/null
+++ b/bitnami/node/6/Dockerfile
@@ -0,0 +1,25 @@
+FROM gcr.io/stacksmith-images/minideb-buildpack:jessie-r10
+
+MAINTAINER Bitnami <containers@bitnami.com>
+
+# System packages required
+RUN install_packages libc6 libssl1.0.0 libncurses5 libtinfo5 zlib1g libbz2-1.0 libreadline6 libstdc++6 libgcc1 ghostscript imagemagick libmysqlclient18
+
+# Install node
+RUN bitnami-pkg unpack node-6.9.5-1 --checksum f257cfe8963f9360804f342f425a90ec0fe2e714c7d7e0adf8478296e2a25c4c
+
+COPY rootfs /
+
+ENV PATH=/opt/bitnami/node/bin:/opt/bitnami/python/bin:$PATH \
+    NODE_PATH=/opt/bitnami/node/lib/node_modules
+
+ENV BITNAMI_APP_NAME=node \
+    BITNAMI_IMAGE_VERSION=6.9.5-r0
+
+WORKDIR /app
+
+EXPOSE 3000
+
+ENTRYPOINT ["/app-entrypoint.sh"]
+
+CMD ["node"]
diff --git a/bitnami/node/6/docker-compose.yml b/bitnami/node/6/docker-compose.yml
new file mode 100644
index 000000000000..b595eee44b71
--- /dev/null
+++ b/bitnami/node/6/docker-compose.yml
@@ -0,0 +1,11 @@
+version: '2'
+
+services:
+  node:
+    tty: true # Enables debugging capabilities when attached to this container.
+    image: bitnami/node:6
+    # command: sh -c 'npm install && npm start'
+    ports:
+      - 3000:3000
+    volumes:
+      - .:/app
diff --git a/bitnami/node/6/rootfs/app-entrypoint.sh b/bitnami/node/6/rootfs/app-entrypoint.sh
new file mode 100755
index 000000000000..b59d2cb1e1bf
--- /dev/null
+++ b/bitnami/node/6/rootfs/app-entrypoint.sh
@@ -0,0 +1,10 @@
+#!/bin/bash -e
+. /opt/bitnami/base/functions
+. /opt/bitnami/base/helpers
+
+print_welcome_page
+check_for_updates &
+
+nami_initialize node
+
+exec tini -- "$@"