diff --git a/nodejs-express-sass/Dockerfile b/nodejs-express-sass/Dockerfile
index 8f7966a..8872909 100644
--- a/nodejs-express-sass/Dockerfile
+++ b/nodejs-express-sass/Dockerfile
@@ -1,4 +1,4 @@
-FROM mhart/alpine-node:7.6.0
+FROM mhart/alpine-node:9
 WORKDIR /src
 # Add app source files
 ADD app/src /src
diff --git a/nodejs-express-sass/app/src/server.js b/nodejs-express-sass/app/src/server.js
index 311f4d6..8ec3cd0 100644
--- a/nodejs-express-sass/app/src/server.js
+++ b/nodejs-express-sass/app/src/server.js
@@ -1,21 +1,16 @@
-var express = require('express');
-var path = require('path');
-var app = express();
+const express = require('express')
+const path = require('path')
+
+const app = express()
 
 // Redirect all static files to public/
-app.use('/static', express.static(path.join(__dirname, 'public')));
+app.use('/static', express.static(path.join(__dirname, 'public')))
 
-var homePath = path.join(__dirname, 'public','html','index.html');
-app.get('/', function (req, res) {
-  res.sendFile(homePath);
-});
+const homePath = path.join(__dirname, 'public', 'html', 'index.html')
+const notFoundPath = path.join(__dirname, 'public', 'html', '404.html')
+const port = process.env.APP_PORT || '8080'
 
-var notFoundPath = path.join(__dirname, 'public','html','404.html');
-app.all('*', function (req, res) {
-  res.sendFile(notFoundPath);
-});
+app.get('/', (req, res) => res.sendFile(homePath))
+app.all('*', (req, res) => res.sendFile(notFoundPath))
 
-var port = process.env.APP_PORT ? process.env.APP_PORT : '8080';
-app.listen(port, function () {
-  console.log(`Example app listening on port ${port}!`);
-});
+app.listen(port, () => console.log(`Example app listening on port ${port}!`))
diff --git a/nodejs-express/Dockerfile b/nodejs-express/Dockerfile
index e4a4a9f..e6a1179 100644
--- a/nodejs-express/Dockerfile
+++ b/nodejs-express/Dockerfile
@@ -1,4 +1,4 @@
-FROM mhart/alpine-node:7.6.0
+FROM mhart/alpine-node:9
 
 WORKDIR /src
 
diff --git a/nodejs-express/app/src/routes/api.js b/nodejs-express/app/src/routes/api.js
new file mode 100644
index 0000000..ec842a0
--- /dev/null
+++ b/nodejs-express/app/src/routes/api.js
@@ -0,0 +1,9 @@
+const express = require('express')
+
+const router = express.Router()
+
+router.get('/', (req, res) => res.send({
+    message: 'Hello world from Hasura'
+}))
+
+module.exports = {router};
diff --git a/nodejs-express/app/src/routes/web.js b/nodejs-express/app/src/routes/web.js
new file mode 100644
index 0000000..308d093
--- /dev/null
+++ b/nodejs-express/app/src/routes/web.js
@@ -0,0 +1,7 @@
+const express = require('express')
+
+const router = express.Router()
+
+router.get('/', (req, res) => res.send('Hello world from Hasura'))
+
+module.exports = {router}
diff --git a/nodejs-express/app/src/server.js b/nodejs-express/app/src/server.js
index baeb4de..afdf3a3 100644
--- a/nodejs-express/app/src/server.js
+++ b/nodejs-express/app/src/server.js
@@ -1,11 +1,8 @@
-var express = require('express');
-var app = express();
+const express = require('express')
 
-//your routes here
-app.get('/', function (req, res) {
-    res.send("Hello World!");
-});
+const app = express()
 
-app.listen(8080, function () {
-  console.log('Example app listening on port 8080!');
-});
+app.use(require('./routes/web').router)
+app.use('/api', require('./routes/api').router)
+
+app.listen(8080, () => console.log('Example app listening on port 8080!'))
diff --git a/php-apache/app/src/index.php b/php-apache/app/src/index.php
index 371aa19..2192b67 100644
--- a/php-apache/app/src/index.php
+++ b/php-apache/app/src/index.php
@@ -1,6 +1,7 @@
 <?php
-    $json = json_encode(array(
-            'message' => 'Hello World!' 
-            ));
-    echo $json;
-?>
+
+$json = json_encode([
+    'message' => 'Hello World from Hasura'
+]);
+
+echo $json;