diff --git a/gulpfile.js b/gulpfile.js
index 78a54c646..4dd4449c3 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -18,8 +18,6 @@ if (argv.help || argv.h) {
     console.log('Supported arguments for "gulp develop":');
     console.log(' --api-origin <cloudron api uri>');
     console.log(' --revision <revision>');
-    console.log(' --appstore-web-origin <appstore web uri>');
-    console.log(' --appstore-api-origin <appstore api uri>');
     console.log(' --appstore-console-origin <appstore console uri>');
 
     process.exit(1);
@@ -34,9 +32,7 @@ if (argv.apiOrigin) {
 }
 
 var appstore = {
-    webOrigin: argv.appstoreWebOrigin || '',
-    consoleOrigin: argv.appstoreConsoleOrigin || '',
-    apiOrigin: argv.appstoreApiOrigin || ''
+    consoleOrigin: argv.appstoreConsoleOrigin || ''
 };
 
 console.log();
@@ -44,9 +40,7 @@ console.log('Cloudron API:          %s', apiOrigin || 'default');
 console.log('Building for revision: %s', revision);
 console.log();
 console.log('Overriding appstore origin:');
-console.log(' Website: %s', appstore.webOrigin || 'no');
 console.log(' Console: %s', appstore.consoleOrigin || 'no');
-console.log(' Api:     %s', appstore.apiOrigin || 'no');
 console.log();
 
 gulp.task('fontawesome', function () {
diff --git a/src/js/client.js b/src/js/client.js
index 3b8c1378a..3b0e34f16 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -382,8 +382,6 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
             avatarUrl: null
         };
         this._config = {
-            apiServerOrigin: null,
-            webServerOrigin: null,
             consoleServerOrigin: null,
             fqdn: null,
             ip: null,
@@ -484,7 +482,7 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
 
     Client.prototype.onConfig = function (callback) {
         this._configListener.push(callback);
-        if (this._config && this._config.apiServerOrigin) callback(this._config);
+        if (this._config) callback(this._config);
     };
 
     Client.prototype.onReconnect = function (callback) {
@@ -521,14 +519,6 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
 
         angular.copy(config, this._config);
 
-<% if (appstore.webOrigin) { -%>
-        this._config.webServerOrigin = '<%= appstore.webOrigin %>';
-<% } -%>
-
-<% if (appstore.apiOrigin) { -%>
-        this._config.apiServerOrigin = '<%= appstore.apiOrigin %>';
-<% } -%>
-
 <% if (appstore.consoleOrigin) { -%>
         this._config.consoleServerOrigin = '<%= appstore.consoleOrigin %>';
 <% } -%>
diff --git a/src/js/setup.js b/src/js/setup.js
index 3ceaa335f..ec544eafd 100644
--- a/src/js/setup.js
+++ b/src/js/setup.js
@@ -13,8 +13,6 @@ app.controller('SetupController', ['$scope', 'Client', function ($scope, Client)
     $scope.client = Client;
     $scope.view = '';
     $scope.initialized = false;
-    $scope.apiServerOrigin = '';
-    $scope.webServerOrigin = '';
     $scope.setupToken = '';
 
     $scope.owner = {
@@ -98,9 +96,6 @@ app.controller('SetupController', ['$scope', 'Client', function ($scope, Client)
             redirectIfNeeded(status);
             setView(search.view);
 
-            $scope.apiServerOrigin = status.apiServerOrigin;
-            $scope.webServerOrigin = status.webServerOrigin;
-
             $scope.setupToken = search.setupToken;
             $scope.initialized = true;
 
diff --git a/src/js/setupdns.js b/src/js/setupdns.js
index 403636020..4293c413a 100644
--- a/src/js/setupdns.js
+++ b/src/js/setupdns.js
@@ -22,7 +22,6 @@ app.controller('SetupDNSController', ['$scope', '$http', '$timeout', 'Client', f
     $scope.isDomain = false;
     $scope.isSubdomain = false;
     $scope.advancedVisible = false;
-    $scope.webServerOrigin = '';
     $scope.clipboardDone = false;
     $scope.search = window.location.search;
     $scope.setupToken = '';
@@ -309,7 +308,6 @@ app.controller('SetupDNSController', ['$scope', '$http', '$timeout', 'Client', f
             $scope.instanceId = search.instanceId;
             $scope.setupToken = search.setupToken;
             $scope.provider = status.provider;
-            $scope.webServerOrigin = status.webServerOrigin;
             $scope.state = 'initialized';
 
             setTimeout(function () { $("[autofocus]:first").focus(); }, 100);