diff --git a/src/js/setupdns.js b/src/js/setupdns.js
index f9921399d..5ae162d41 100644
--- a/src/js/setupdns.js
+++ b/src/js/setupdns.js
@@ -83,6 +83,7 @@ app.controller('SetupDNSController', ['$scope', '$http', '$timeout', 'Client', f
         { name: 'Gandi LiveDNS', value: 'gandi' },
         { name: 'GoDaddy', value: 'godaddy' },
         { name: 'Google Cloud DNS', value: 'gcdns' },
+        { name: 'Linode', value: 'linode' },
         { name: 'Name.com', value: 'namecom' },
         { name: 'Namecheap', value: 'namecheap' },
         { name: 'Wildcard', value: 'wildcard' },
diff --git a/src/setupdns.html b/src/setupdns.html
index c2f982f7b..456bbb49c 100644
--- a/src/setupdns.html
+++ b/src/setupdns.html
@@ -192,8 +192,9 @@
                                 </div>
 
                                 <!-- Linode -->
-                                <p class="small text-warning" ng-show="dnsCredentials.provider === 'linode'">
-                                    <b>Linode DNS average <a target="_blank" ng-href="https://docs.cloudron.io/domains/#linode-dns">propagation time</a> is 30 minutes. Cloudron setup &amp; installing apps will take a while.</b>
+                                <p class="form-group" ng-show="dnsCredentials.provider === 'linode'">
+                                    <label class="control-label">API Token</label>
+                                    <input type="text" class="form-control" ng-model="dnsCredentials.linodeToken" name="linodeToken" ng-required="dnsCredentials.provider === 'linode'" ng-disabled="dnsCredentials.busy">
                                 </p>
 
                                 <!-- Wildcard -->
diff --git a/src/translation/en.json b/src/translation/en.json
index 0611f516d..d5baebc93 100644
--- a/src/translation/en.json
+++ b/src/translation/en.json
@@ -49,7 +49,6 @@
             "memoryRequirement": "Requires at least {{ size }} memory",
             "location": "Location",
             "locationPlaceholder": "Leave empty to use bare domain",
-            "linodeWarning": "Linode DNS average <a target=\"_blank\" href=\"{{ linodeDocsLink }}\">propagation time</a> is 30 minutes. Installing the app will take a while.",
             "manualWarning": "Add an A record manually for <b>{{ location }}</b> to this Cloudron's public IP",
             "userManagement": "User management",
             "userManagementNone": "This app has it's own user management.",
@@ -474,7 +473,6 @@
             "description": "Cloudron will make the necessary DNS changes across all the domains and restart the mail server. Desktop & Mobile email clients have to be re-configured to use this new location as the IMAP and SMTP server.",
             "location": "Location",
             "locationPlaceholder": "Leave empty to use bare domain",
-            "linodeInfo": "Linode DNS average <a target=\"_blank\" href=\"{{ linodeDocsLink }}\">propagation time</a> is 30 minutes. Changing the location will take a while.",
             "manualInfo": "Add an A record manually for {{ domain }} to this Cloudron's public IP"
         },
         "changeMailSizeDialog": {
@@ -713,7 +711,6 @@
             "namecheapUsername": "Namecheap Username",
             "namecheapApiKey": "API Key",
             "namecheapInfo": "The server IP needs to be whitelisted for this API Key.",
-            "linodeInfo": "Linode DNS average <a target=\"_blank\" href=\"{{ linodeDocsLink }}\">propagation time</a> is 30 minutes. Installing apps &amp; and getting a Let's Encrypt certificate will take a while.",
             "manualInfo": "All DNS records have to be setup manually before each app installation.",
             "wildcardInfo": "Setup <i>A</i> records for <b>*.{{ domain }}</b> and <b>{{ domain }}</b> to this server's IP.",
             "letsEncryptInfo": "Let's Encrypt requires your server to be reachable on port 80",
diff --git a/src/views/app.html b/src/views/app.html
index b7a646eca..aa4f9ff0b 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -388,12 +388,6 @@
               </div>
             </div>
 
-            <p class="small text-center text-warning" ng-show="clone.domain.provider === 'linode'">
-              <b>Linode DNS average <a target="_blank" ng-href="https://docs.cloudron.io/domains/#linode-dns">propagation time</a> is 30 minutes.
-                Cloning the app will take a while.</b>
-              <br>
-            </p>
-
             <p class="text-center" ng-show="clone.location && clone.domain.provider === 'manual'">
               <b>Add an A record manually for {{ clone.location }} to this Cloudron's public IP</b>
               <br>
@@ -560,7 +554,6 @@
                 </div>
               </div>
 
-              <p class="text-small text-bold text-warning" ng-show="location.domain.provider === 'linode'" ng-bind-html="'appstore.installDialog.linodeWarning' | tr:{ linodeDocsLink: 'https://docs.cloudron.io/domains/#linode-dns' }"></p>
               <p class="text-small text-bold text-warning" ng-show="location.location && location.domain.provider === 'manual'" ng-bind-html="'appstore.installDialog.manualWarning' | tr:{ location: (location.location + '.' + location.domain.domain) }"></p>
 
               <!-- hidden submit has to be prior to other button elements, otherwise firefox will treat them as the "enter" key action, in this case the alternate domain delete button! -->
diff --git a/src/views/appstore.html b/src/views/appstore.html
index 5d396f07a..0f427fb43 100644
--- a/src/views/appstore.html
+++ b/src/views/appstore.html
@@ -36,7 +36,6 @@
               <div ng-show="appInstall.error.location" class="text-small">{{ appInstall.error.location }}</div>
             </div>
 
-            <p class="text-small text-warning" ng-show="appInstall.domain.provider === 'linode'" ng-bind-html="'appstore.installDialog.linodeWarning' | tr:{ linodeDocsLink: 'https://docs.cloudron.io/domains/#linode-dns' }"></p>
             <p class="text-small text-warning" ng-show="appInstall.location && appInstall.domain.provider === 'manual'" ng-bind-html="'appstore.installDialog.manualWarning' | tr:{ location: (appInstall.location + '.' + appInstall.domain.domain) }"></p>
 
             <div class="has-error text-center" ng-show="appInstall.error.port">{{ appInstall.error.port }}</div>
diff --git a/src/views/domains.html b/src/views/domains.html
index e7f7dce85..bd22c3466 100644
--- a/src/views/domains.html
+++ b/src/views/domains.html
@@ -130,7 +130,6 @@
           </div>
 
           <p class="small text-info text-bold" ng-show="domainConfigure.provider === 'namecheap'" ng-bind-html="'domains.domainDialog.namecheapInfo' | tr"></p>
-          <p class="small text-info text-bold" ng-show="domainConfigure.provider === 'linode'" ng-bind-html="'domains.domainDialog.linodeInfo' | tr:{ linodeDocsLink: 'https://docs.cloudron.io/domains/#linode-dns' }"></p>
           <p class="small text-info text-bold" ng-show="domainConfigure.provider === 'wildcard'" ng-bind-html="'domains.domainDialog.wildcardInfo' | tr:{ domain: domainConfigure.adding ? domainConfigure.newDomain : domainConfigure.domain.domain } }"></p>
           <p class="small text-info text-bold" ng-show="domainConfigure.provider === 'manual'" ng-bind-html="'domains.domainDialog.manualInfo' | tr"></p>
           <p class="small text-info text-bold" ng-show="needsPort80(domainConfigure.provider, domainConfigure.tlsConfig.provider)" ng-bind-html="'domains.domainDialog.letsEncryptInfo' | tr"></p>
diff --git a/src/views/emails.html b/src/views/emails.html
index 9ff700965..b6822a553 100644
--- a/src/views/emails.html
+++ b/src/views/emails.html
@@ -32,7 +32,6 @@
             </div>
           </div>
 
-          <p class="text-center text-warning text-bold" ng-show="mailLocation.domain.provider === 'linode'" ng-bind-html="'emails.changeDomainDialog.linodeInfo' | tr:{ linodeDocsLink: 'https://docs.cloudron.io/domains/#linode-dns' }"></p>
           <p class="text-center text-warning text-bold" ng-show="mailLocation.domain.provider === 'manual'" ng-bind-html="'emails.changeDomainDialog.manualInfo' | tr:{ domain: mailLocation.domain.domain }"></p>
 
           <input class="ng-hide" type="submit" ng-disabled="mailLocationForm.$invalid"/>