diff --git a/nginx-conf/default.conf b/nginx-conf/default.conf
index 6c764d4..2155c95 100644
--- a/nginx-conf/default.conf
+++ b/nginx-conf/default.conf
@@ -18,14 +18,6 @@ server {
         return 200 'Ok';
     }
 
-    location /graph/ {
-        proxy_set_header Host $http_host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_pass http://dancefinder;
-    }
-
     error_log /dev/stdout info;
 
     # redirect server error pages to the static page /50x.html
diff --git a/server/index.js b/server/index.js
index 34e4753..e71e3bb 100644
--- a/server/index.js
+++ b/server/index.js
@@ -23,9 +23,9 @@ if (config.dev) {
 // Add graphql mocking middleware
 //addGraphMiddleware(app);
 
-app.use('/graph/', proxy('localhost:8081', {
+app.use('/query/', proxy('localhost:6080', {
       proxyReqPathResolver: function (req) {
-        return '/graph/';
+        return '/query';
       }
     }
   )
diff --git a/utils/graph-client/utils.js b/utils/graph-client/utils.js
index 3f21c02..21e8881 100644
--- a/utils/graph-client/utils.js
+++ b/utils/graph-client/utils.js
@@ -5,7 +5,7 @@ const { includeCredentials } = require('./middleware');
 import { onError } from 'apollo-link-error';
 import { default as webAuth} from '../auth';
 
-const defaultGraphUri = '/graph/';
+const defaultGraphUri = '/query/';
 const httpLink = new HttpLink({ uri: defaultGraphUri, fetch: includeCredentials, credentials: 'same-origin' });
 const errorLink = onError(({ graphQLErrors, networkError, operation, forward }) => {
       if (graphQLErrors) {