diff --git a/bitnami/express/Dockerfile b/bitnami/express/Dockerfile
index 6197a059008a..72890e81e05d 100644
--- a/bitnami/express/Dockerfile
+++ b/bitnami/express/Dockerfile
@@ -24,7 +24,7 @@ COPY rootfs/ /
 
 # The extra files that we bundle should use the Bitnami User
 # so the entrypoint does not have any permission issues
-RUN chown -R bitnami: /app /app_template
+RUN chown -R bitnami: /app /dist
 
 USER bitnami
 
diff --git a/bitnami/express/rootfs/app-entrypoint.sh b/bitnami/express/rootfs/app-entrypoint.sh
index af0ac14e3686..b747793e9953 100755
--- a/bitnami/express/rootfs/app-entrypoint.sh
+++ b/bitnami/express/rootfs/app-entrypoint.sh
@@ -52,23 +52,13 @@ wait_for_db() {
   fi
 }
 
-__setup_db() {
-  local server=$1
-  local module=$2
-  npm install $module --save
-
-  log "Adding $server example files under config/$server.js"
-  mkdir -p config/
-  cp -rn /app_template/config/$server.js config/$server.js
-}
-
 setup_db() {
   if getent hosts mongodb >/dev/null; then
-    __setup_db mongodb mongodb@2.1.18
+    npm install --save mongodb@2.1.18
   fi
 
   if getent hosts mariadb >/dev/null; then
-    __setup_db mariadb mysql@2.12.0
+    npm install --save mysql@2.12.0
   fi
 }
 
@@ -80,6 +70,9 @@ if [ "$1" == npm -a "$2" == "start" ]; then
   if ! app_present; then
     log "Creating express application"
     express . -f
+
+    log "Adding dist samples"
+    cp -r /dist/samples .
   fi
 
   if ! dependencies_up_to_date; then
diff --git a/bitnami/express/rootfs/app_template/config/mariadb.js b/bitnami/express/rootfs/dist/samples/mariadb.js
similarity index 100%
rename from bitnami/express/rootfs/app_template/config/mariadb.js
rename to bitnami/express/rootfs/dist/samples/mariadb.js
diff --git a/bitnami/express/rootfs/app_template/config/mongodb.js b/bitnami/express/rootfs/dist/samples/mongodb.js
similarity index 100%
rename from bitnami/express/rootfs/app_template/config/mongodb.js
rename to bitnami/express/rootfs/dist/samples/mongodb.js