diff --git a/gulpfile.js b/gulpfile.js
index f7be34c74..55bb17239 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -19,6 +19,8 @@ if (argv.help || argv.h) {
     console.log(' --client-secret <clientSecret>');
     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>');
 
     process.exit(1);
 }
@@ -31,6 +33,11 @@ var oauth = {
 
 var revision = argv.revision || '';
 
+var appstore = {
+    webOrigin: argv.appstoreWebOrigin || '',
+    apiOrigin: argv.appstoreApiOrigin || ''
+}
+
 console.log();
 console.log('Using OAuth credentials:');
 console.log(' ClientId:      %s', oauth.clientId);
@@ -39,6 +46,10 @@ console.log(' Cloudron API:  %s', oauth.apiOrigin || 'default');
 console.log();
 console.log('Building for revision: %s', revision);
 console.log();
+console.log('Overriding appstore origin:');
+console.log(' Website: %s', appstore.webOrigin || 'no');
+console.log(' Api:     %s', appstore.apiOrigin || 'no');
+console.log();
 
 gulp.task('fontawesome', function () {
     return gulp.src([
@@ -83,7 +94,7 @@ gulp.task('js-index', function () {
         'src/js/main.js',
         'src/views/*.js'
         ])
-        .pipe(ejs({ oauth: oauth, revision: revision }, {}, { ext: '.js' }))
+        .pipe(ejs({ oauth: oauth, revision: revision, appstore: appstore }, {}, { ext: '.js' }))
         .pipe(sourcemaps.init())
         .pipe(concat('index.js', { newLine: ';' }))
         .pipe(sourcemaps.write())
@@ -92,7 +103,7 @@ gulp.task('js-index', function () {
 
 gulp.task('js-logs', function () {
     return gulp.src(['src/js/logs.js', 'src/js/client.js'])
-        .pipe(ejs({ oauth: oauth }, {}, { ext: '.js' }))
+        .pipe(ejs({ oauth: oauth, appstore: appstore }, {}, { ext: '.js' }))
         .pipe(sourcemaps.init())
         .pipe(concat('logs.js', { newLine: ';' }))
         .pipe(sourcemaps.write())
@@ -101,7 +112,7 @@ gulp.task('js-logs', function () {
 
 gulp.task('js-terminal', function () {
     return gulp.src(['src/js/terminal.js', 'src/js/client.js'])
-        .pipe(ejs({ oauth: oauth }, {}, { ext: '.js' }))
+        .pipe(ejs({ oauth: oauth, appstore: appstore }, {}, { ext: '.js' }))
         .pipe(sourcemaps.init())
         .pipe(concat('terminal.js', { newLine: ';' }))
         .pipe(sourcemaps.write())
@@ -110,7 +121,7 @@ gulp.task('js-terminal', function () {
 
 gulp.task('js-setup', function () {
     return gulp.src(['src/js/setup.js', 'src/js/client.js'])
-        .pipe(ejs({ oauth: oauth }, {}, { ext: '.js' }))
+        .pipe(ejs({ oauth: oauth, appstore: appstore }, {}, { ext: '.js' }))
         .pipe(sourcemaps.init())
         .pipe(concat('setup.js', { newLine: ';' }))
         .pipe(sourcemaps.write())
@@ -119,7 +130,7 @@ gulp.task('js-setup', function () {
 
 gulp.task('js-setupdns', function () {
     return gulp.src(['src/js/setupdns.js', 'src/js/client.js'])
-        .pipe(ejs({ oauth: oauth }, {}, { ext: '.js' }))
+        .pipe(ejs({ oauth: oauth, appstore: appstore }, {}, { ext: '.js' }))
         .pipe(sourcemaps.init())
         .pipe(concat('setupdns.js', { newLine: ';' }))
         .pipe(sourcemaps.write())
@@ -128,7 +139,7 @@ gulp.task('js-setupdns', function () {
 
 gulp.task('js-restore', function () {
     return gulp.src(['src/js/restore.js', 'src/js/client.js'])
-        .pipe(ejs({ oauth: oauth }, {}, { ext: '.js' }))
+        .pipe(ejs({ oauth: oauth, appstore: appstore }, {}, { ext: '.js' }))
         .pipe(sourcemaps.init())
         .pipe(concat('restore.js', { newLine: ';' }))
         .pipe(sourcemaps.write())
diff --git a/src/index.html b/src/index.html
index 30380af3a..7c21750ad 100644
--- a/src/index.html
+++ b/src/index.html
@@ -101,7 +101,7 @@
             <h4 class="modal-title">Setup Subscription</h4>
           </div>
           <div class="modal-body">
-            <iframe ng-src="{{ 'https://cloudron.io/helper/setup_subscription_info.html?email=' + subscription.emailEncoded + '&cloudronId=' + subscription.cloudronId }}" style="width: 100%; height: 100px; border: none;"></iframe>
+            <iframe ng-src="{{ config.webServerOrigin + '/helper/setup_subscription_info.html?email=' + subscription.emailEncoded + '&cloudronId=' + subscription.cloudronId }}" style="width: 100%; height: 100px; border: none;"></iframe>
           </div>
           <div class="modal-footer">
             <a class="btn btn-success" ng-click="waitForPlanSelection()" ng-href="{{ config.webServerOrigin + '/console.html#/userprofile?view=subscriptions&email=' + subscription.emailEncoded + '&cloudronId=' + subscription.cloudronId }}" target="_blank" ng-disabled="waitingForPlanSelection"><i class="fa fa-circle-notch fa-spin" ng-show="waitingForPlanSelection"></i> Try For Free</a>
@@ -129,7 +129,7 @@
 
                 <div class="collapse navbar-collapse">
                     <ul class="nav navbar-nav navbar-right" ng-hide="hideNavBarActions">
-                        <li ng-show="subscription.plan && subscription.plan.id === 'free'">
+                        <li ng-show="subscription.plan.id === 'free' || subscription.plan.id === 'expired'">
                             <a ng-href="" ng-click="showSubscriptionModal()" style="cursor: pointer">
                                 <span class="badge badge-success">Setup Subscription</span>
                             </a>
diff --git a/src/js/client.js b/src/js/client.js
index 22dc30aba..3009722b7 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -268,6 +268,14 @@ angular.module('Application').service('Client', ['$http', '$interval', 'md5', 'N
 
         angular.copy(config, this._config);
 
+<% if (appstore.webOrigin) { -%>
+        this._config.webServerOrigin = '<%= appstore.webOrigin %>';
+<% } -%>
+
+<% if (appstore.ApiOrigin) { -%>
+        this._config.apiServerOrigin = '<%= appstore.webOrigin %>';
+<% } -%>
+
         this._configListener.forEach(function (callback) {
             callback(that._config);
         });
diff --git a/src/views/appstore.html b/src/views/appstore.html
index 88ed5a40d..44a03942f 100644
--- a/src/views/appstore.html
+++ b/src/views/appstore.html
@@ -148,7 +148,7 @@
           <p>Please upgrade to a server instance with more memory. Alternately, free up resources by uninstalling unused applications.</p>
         </div>
         <div class="collapse" id="collapseAppLimitReached" data-toggle="false">
-          <iframe ng-src="{{ 'https://cloudron.io/helper/premium_app.html?appstoreId=' + appInstall.app.manifest.appstoreId }}" style="width: 100%; height: 200px; border: none;"></iframe>
+          <iframe ng-src="{{ config.webServerOrigin + '/helper/premium_app.html?appstoreId=' + appInstall.app.manifest.appstoreId }}" style="width: 100%; height: 200px; border: none;"></iframe>
         </div>
       </div>
       <div class="modal-footer">