diff --git a/assets/package-lock.json b/assets/package-lock.json
index 5708ce60f03a8b6b18f42794bc00a44c6798b3c7..df9a1b974074d84a905b1b755feb95345055dea3 100644
--- a/assets/package-lock.json
+++ b/assets/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "waterdataui-assets",
-  "version": "0.17.0dev",
+  "version": "0.18.0dev",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/graph-server/package-lock.json b/graph-server/package-lock.json
index ab39f4830008144339b6766cc5556cbc34cdb812..6bc8f180ea4e224274859bb47872661f8ddc7fef 100644
--- a/graph-server/package-lock.json
+++ b/graph-server/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "waterdataui-graph-server",
-  "version": "0.17.0dev",
+  "version": "0.18.0dev",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/graph-server/src/index.js b/graph-server/src/index.js
index 4dd9a5bc7918980ce81f606712872a852033a6d9..a3b1e5e2dc02c8e39f11e88239a0b83a6764ae32 100644
--- a/graph-server/src/index.js
+++ b/graph-server/src/index.js
@@ -8,8 +8,9 @@ const { version } = require('../package.json');
 const renderToRespone = require('./renderer');
 
 
-const PORT = process.env.NODE_PORT || 2929;
+const PORT = process.env.NODE_PORT || 2928;
 const CACHE_TIMEOUT = 15 * 60;  // 15 minutes
+const PATH_CONTEXT = process.env.NODE_PORT || '/api/graph-images';
 
 
 // Create the Express app
@@ -31,7 +32,7 @@ const server = app.listen(PORT, function () {
 /**
  * Render hydrograph PNGs
  */
-app.get('/monitoring-location/:siteID/', cache({ttl: CACHE_TIMEOUT}), checkSchema({
+app.get(`${PATH_CONTEXT}/monitoring-location/:siteID/`, cache({ttl: CACHE_TIMEOUT}), checkSchema({
     renderer: {
     },
     parameterCode: {
@@ -67,7 +68,7 @@ app.get('/monitoring-location/:siteID/', cache({ttl: CACHE_TIMEOUT}), checkSchem
     });
 });
 
-app.get('/status', function (req, res) {
+app.get(`${PATH_CONTEXT}/status`, function (req, res) {
     res.status(200);
     res.send({
         version: version
diff --git a/wdfn-server/Makefile b/wdfn-server/Makefile
index 9734195766a2d72bbdc6198897ddccc4292812eb..29d86dc39090b4b1cec6f1122335011ba63111a7 100644
--- a/wdfn-server/Makefile
+++ b/wdfn-server/Makefile
@@ -31,7 +31,7 @@ env-wdfn: wdfn-server/env wdfn-server/instance/config.py wdfn-env-requirements
 
 wdfn-server/env:
 	@echo 'Creating the virtualenv env'
-	virtualenv --python=python3.6 --no-download wdfn-server/env
+	virtualenv --python=python3 --no-download wdfn-server/env
 
 wdfn-env-requirements:
 	@echo 'Installing requirements.txt'