diff --git a/setup/start/nginx/appconfig.ejs b/setup/start/nginx/appconfig.ejs
index 827190a8c..d789e43be 100644
--- a/setup/start/nginx/appconfig.ejs
+++ b/setup/start/nginx/appconfig.ejs
@@ -162,7 +162,7 @@ server {
         # graphite paths (uncomment block below and visit /graphite/index.html)
         # remember to comment out the CSP policy as well to access the graphite dashboard
         # location ~ ^/(graphite|content|metrics|dashboard|render|browser|composer)/ {
-        #     proxy_pass   http://127.0.0.1:8000;
+        #     proxy_pass   http://127.0.0.1:8417;
         #     client_max_body_size 1m;
         # }
 
diff --git a/src/apps.js b/src/apps.js
index 7ddca8a03..928f4d867 100644
--- a/src/apps.js
+++ b/src/apps.js
@@ -154,7 +154,8 @@ function validatePortBindings(portBindings, manifest) {
         config.get('ldapPort'), /* ldap server (lo) */
         3306, /* mysql (lo) */
         4190, /* managesieve */
-        8000, /* graphite (lo) */
+        8000, /* ESXi monitoring */
+        8417, /* graphite (lo) */
     ];
 
     if (!portBindings) return null;
diff --git a/src/graphs.js b/src/graphs.js
index 3b0f8cf47..2285d8fde 100644
--- a/src/graphs.js
+++ b/src/graphs.js
@@ -31,7 +31,7 @@ function startGraphite(existingInfra, callback) {
                 --dns-search=. \
                 -p 127.0.0.1:2003:2003 \
                 -p 127.0.0.1:2004:2004 \
-                -p 127.0.0.1:8000:8000 \
+                -p 127.0.0.1:8417:8000 \
                 -v "${dataDir}/graphite:/var/lib/graphite" \
                 --label isCloudronManaged=true \
                 --read-only -v /tmp -v /run "${tag}"`;
diff --git a/src/infra_version.js b/src/infra_version.js
index 0c85dfc7b..8620610e2 100644
--- a/src/infra_version.js
+++ b/src/infra_version.js
@@ -20,6 +20,6 @@ exports = module.exports = {
         'mongodb': { repo: 'cloudron/mongodb', tag: 'cloudron/mongodb:2.0.2@sha256:95e006390ddce7db637e1672eb6f3c257d3c2652747424f529b1dee3cbe6728c' },
         'redis': { repo: 'cloudron/redis', tag: 'cloudron/redis:2.0.0@sha256:8a88dd334b62b578530a014ca1a2425a54cb9df1e475f5d3a36806e5cfa22121' },
         'mail': { repo: 'cloudron/mail', tag: 'cloudron/mail:2.0.0@sha256:3c0fbb2a042ac471940ac3e9f6ffa900c8a294941fb7de509b2e3309b09fbffd' },
-        'graphite': { repo: 'cloudron/graphite', tag: 'cloudron/graphite:2.0.0@sha256:454f035d60b768153d4f31210380271b5ba1c09367c9d95c7fa37f9e39d2f59c' }
+        'graphite': { repo: 'cloudron/graphite', tag: 'cloudron/graphite:2.0.1@sha256:454f035d60b768153d4f31210380271b5ba1c09367c9d95c7fa37f9e39d2f59c' }
     }
 };
diff --git a/src/routes/graphs.js b/src/routes/graphs.js
index 34185756d..5537da961 100644
--- a/src/routes/graphs.js
+++ b/src/routes/graphs.js
@@ -7,7 +7,7 @@ exports = module.exports = {
 var middleware = require('../middleware/index.js'),
     url = require('url');
 
-var graphiteProxy = middleware.proxy(url.parse('http://127.0.0.1:8000'));
+var graphiteProxy = middleware.proxy(url.parse('http://127.0.0.1:8417'));
 
 function getGraphs(req, res, next) {
     var parsedUrl = url.parse(req.url, true /* parseQueryString */);