diff --git a/bitnami/express/Dockerfile b/bitnami/express/Dockerfile
index c8d12c8dd0cd..62f3acb67b81 100644
--- a/bitnami/express/Dockerfile
+++ b/bitnami/express/Dockerfile
@@ -19,7 +19,7 @@ RUN rm -rf /app
 
 # ExpressJS template
 ENV BITNAMI_APP_NAME=express
-ENV BITNAMI_IMAGE_VERSION=4.14.0-r17
+ENV BITNAMI_IMAGE_VERSION=4.14.0-r18
 
 COPY rootfs/ /
 
diff --git a/bitnami/express/rootfs/app-entrypoint.sh b/bitnami/express/rootfs/app-entrypoint.sh
index afc208f2a55b..b5958423ed76 100755
--- a/bitnami/express/rootfs/app-entrypoint.sh
+++ b/bitnami/express/rootfs/app-entrypoint.sh
@@ -62,17 +62,29 @@ wait_for_db() {
   fi
 }
 
+bootstrap_express_app() {
+  log "Creating express application"
+  express . -f
+
+  log "Adding nodemon npm module (dev)"
+  npm install nodemon --save-dev
+  sed -i 's,node ./bin/www,nodemon ./bin/www,' package.json
+}
+
 add_database_support() {
   if database_tier_exists; then
     if getent hosts mongodb >/dev/null && ! npm ls mongodb >/dev/null; then
+      log "Adding mongodb npm module"
       npm install --save mongodb
     fi
 
     if getent hosts mariadb >/dev/null && ! npm ls mysql >/dev/null || getent hosts mysql >/dev/null && ! npm ls mysql >/dev/null; then
+      log "Adding mysql npm module"
       npm install --save mysql
     fi
 
     if getent hosts postgresql >/dev/null && ! npm ls pg pg-hstore >/dev/null; then
+      log "Adding pg pg-hstore npm modules"
       npm install --save pg pg-hstore
     fi
   fi
@@ -126,8 +138,7 @@ if [ "$1" == npm ] && [ "$2" == "start" -o "$2" == "run" ]; then
   wait_for_db
 
   if ! app_present; then
-    log "Creating express application"
-    express . -f
+    bootstrap_express_app
     add_database_support
     add_sample_code
   fi