diff --git a/README.md b/README.md
index 2ae4fac9..72596366 100644
--- a/README.md
+++ b/README.md
@@ -94,7 +94,7 @@ A: Use `npm dedupe` to remove duplicates in npm. This might fix that you're not
 Q: How can I use a local copy of SPOOL and Onion?
 A: Easily by starting the your gulp process with the following command:
 ```
-ONION_BASE_URL='/beta/' ONION_API_ENDPOINT='http://localhost:8000/api' gulp serve
+ONION_BASE_URL='/' ONION_API_ENDPOINT='http://localhost:8000/api' gulp serve
 ```
 
 Reading list
diff --git a/gulpfile.js b/gulpfile.js
index fe7e75a8..1e4e78ad 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -55,8 +55,8 @@ var config = {
 
 var constants = {
     BASE_URL: (function () { var baseUrl = process.env.ONION_BASE_URL || '/'; return baseUrl + (baseUrl.match(/\/$/) ? '' : '/'); })(),
-    API_ENDPOINT: process.env.ONION_API_ENDPOINT || 'http://staging.ascribe.io/api/',
     SERVER_URL: process.env.ONION_SERVER_URL || 'http://staging.ascribe.io/',
+    API_ENDPOINT: process.env.ONION_SERVER_URL + 'api/' || 'http://staging.ascribe.io/api/',
     DEBUG: !argv.production,
     CREDENTIALS: 'ZGltaUBtYWlsaW5hdG9yLmNvbTowMDAwMDAwMDAw' // dimi@mailinator:0000000000
 };