diff --git a/README.md b/README.md
index fa470405..deef700f 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ npm install arduino-create-agent-js-client --save
 ```js
 import Daemon from 'arduino-create-agent-js-client';
 
-const daemon = new Daemon('https://builder.arduino.cc/v3/boards');
+const daemon = new Daemon();
 
 daemon.agentFound.subscribe(status => {
   // true / false
diff --git a/demo/app.jsx b/demo/app.jsx
index 0eb80b3f..464c7a75 100644
--- a/demo/app.jsx
+++ b/demo/app.jsx
@@ -31,7 +31,7 @@ const scrollToBottom = (target) => {
   }
 };
 
-const daemon = new Daemon('https://builder.arduino.cc/v3/boards', chromeExtensionID);
+const daemon = new Daemon(chromeExtensionID);
 
 const handleUpload = () => {
   const target = {
diff --git a/src/chrome-app-daemon.js b/src/chrome-app-daemon.js
index 0f270660..e1727af5 100644
--- a/src/chrome-app-daemon.js
+++ b/src/chrome-app-daemon.js
@@ -26,8 +26,8 @@ import Daemon from './daemon';
 const POLLING_INTERVAL = 2000;
 
 export default class ChromeOsDaemon extends Daemon {
-  constructor(boardsUrl, chromeExtensionId) {
-    super(boardsUrl);
+  constructor(chromeExtensionId) {
+    super();
     this.channel = null;
 
     this.openChannel(() => this.channel.postMessage({
diff --git a/src/daemon.js b/src/daemon.js
index 448d5521..acf7b35d 100644
--- a/src/daemon.js
+++ b/src/daemon.js
@@ -24,8 +24,7 @@ import { takeUntil, filter, startWith, first, distinctUntilChanged } from 'rxjs/
 const POLLING_INTERVAL = 1500;
 
 export default class Daemon {
-  constructor(boardsUrl = 'https://builder.arduino.cc/v3/boards') {
-    this.BOARDS_URL = boardsUrl;
+  constructor() {
     this.UPLOAD_NOPE = 'UPLOAD_NOPE';
     this.UPLOAD_DONE = 'UPLOAD_DONE';
     this.UPLOAD_ERROR = 'UPLOAD_ERROR';
@@ -112,8 +111,9 @@ export default class Daemon {
 
     this.closeSerialMonitor(target.port);
 
+    const IS_DEV = window.location.hostname.indexOf('-dev') !== -1 || window.location.hostname.indexOf('local') !== -1 ? '-dev' : '';
     // Fetch command line for the board
-    fetch(`${this.BOARDS_URL}/${target.board}/compute`, {
+    fetch(`https://builder${IS_DEV}.arduino.cc/v3/boards/${target.board}/compute`, {
       method: 'POST',
       body: JSON.stringify({ action: 'upload', verbose })
     })
diff --git a/src/socket-daemon.js b/src/socket-daemon.js
index a39f7f72..d5dbb7fe 100644
--- a/src/socket-daemon.js
+++ b/src/socket-daemon.js
@@ -54,8 +54,8 @@ if (browser.name !== 'chrome' && browser.name !== 'firefox') {
 }
 
 export default class SocketDaemon extends Daemon {
-  constructor(boardsUrl) {
-    super(boardsUrl);
+  constructor() {
+    super();
     this.selectedProtocol = PROTOCOL.HTTP;
     this.socket = null;
     this.pluginURL = null;