diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index be047521c..3d627b1dc 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,6 +1,6 @@
 <!-- Thank you for taking the time to submit an issue using this template. By following the instructions and filling out the sections below, you will help the developers get the necessary information to fix your issue. You may remove sections that aren't relevant to your particular case. You can also preview your report before submitting it. -->
 <!-- Please note that the issues are a tool for Duplicati developers. If you post here, you are supposed to want to help the project by providing timely information on your problem so it can be fixed. If this is not the case, please use the forum instead -->
-<!-- Love Duplicati? Please consider supporting our collective at https://opencollective.com/duplicati/donate. -->
+
 
 <!-- Please search to see if an issue has already been created for your report. -->
 <!-- Replace the empty checkbox [ ] below with a checked one [x] if you already searched for duplicate bugs. -->
diff --git a/Duplicati.Library.RestAPI/RESTMethods/SystemInfo.cs b/Duplicati.Library.RestAPI/RESTMethods/SystemInfo.cs
index 465396ea9..6c7f37b24 100644
--- a/Duplicati.Library.RestAPI/RESTMethods/SystemInfo.cs
+++ b/Duplicati.Library.RestAPI/RESTMethods/SystemInfo.cs
@@ -27,7 +27,7 @@ using Duplicati.Library.RestAPI;
 
 namespace Duplicati.Server.WebServer.RESTMethods
 {
-    public class SystemInfo : IRESTMethodGET, IRESTMethodPOST, IRESTMethodDocumented
+    public class SystemInfo : IRESTMethodGET, IRESTMethodDocumented
     {
         public string Description { get { return "Gets various system properties"; } }
         public IEnumerable<KeyValuePair<string, Type>> Types
@@ -45,26 +45,6 @@ namespace Duplicati.Server.WebServer.RESTMethods
             info.BodyWriter.OutputOK(SystemData(info));            
         }
 
-        public void POST(string key, RequestInfo info)
-        {
-            switch ((key ?? "").ToLowerInvariant())
-            {
-                case "suppressdonationmessages":
-                    Library.Main.Utility.SuppressDonationMessages = true;
-                    info.OutputOK();
-                    return;
-
-                case "showdonationmessages":
-                    Library.Main.Utility.SuppressDonationMessages = false;
-                    info.OutputOK();
-                    return;
-
-                default:
-                    info.ReportClientError("No such action", System.Net.HttpStatusCode.NotFound);
-                    return;
-            }
-        }
-
         private static object SystemData(RequestInfo info)
         {
             var browserlanguage = RESTHandler.ParseDefaultRequestCulture(info) ?? System.Globalization.CultureInfo.InvariantCulture;
@@ -107,7 +87,6 @@ namespace Duplicati.Server.WebServer.RESTMethods
                 ServerModules = Serializable.ServerSettings.ServerModules,
                 UsingAlternateUpdateURLs = Duplicati.Library.AutoUpdater.AutoUpdateSettings.UsesAlternateURLs,
                 LogLevels = Enum.GetNames(typeof(Duplicati.Library.Logging.LogMessageType)),
-                SuppressDonationMessages = Duplicati.Library.Main.Utility.SuppressDonationMessages,
                 SpecialFolders = from n in SpecialFolders.Nodes select new { ID = n.id, Path = n.resolvedpath },
                 BrowserLocale = new
                 {
diff --git a/Duplicati/CommandLine/CLI/Commands.cs b/Duplicati/CommandLine/CLI/Commands.cs
index c8f5c78ee..f209384bc 100644
--- a/Duplicati/CommandLine/CLI/Commands.cs
+++ b/Duplicati/CommandLine/CLI/Commands.cs
@@ -580,15 +580,6 @@ namespace Duplicati.CommandLine
                         output.MessageEvent(string.Format("Restored {0} ({1}) files to {2}", res.RestoredFiles, Library.Utility.Utility.FormatSizeString(res.SizeOfRestoredFiles), string.IsNullOrEmpty(restorePath) ? "original path" : restorePath));
                         output.MessageEvent(string.Format("Duration of restore: {0:hh\\:mm\\:ss}", res.Duration));
 
-                        if (res.RestoredFiles > 0 && !Library.Main.Utility.SuppressDonationMessages)
-                        {
-                            output.MessageEvent("***********************************************");
-                            output.MessageEvent("Did we help save your files? If so, please support Duplicati with a donation. We suggest 10€ for private use and 100€ for commercial use.");
-                            output.MessageEvent("");
-                            output.MessageEvent("https://www.duplicati.com/donate/");
-                            output.MessageEvent("***********************************************");
-                        }
-
                         if (output.FullResults)
                             Library.Utility.Utility.PrintSerializeObject(res, outwriter);
 
diff --git a/Duplicati/Library/Main/Utility.cs b/Duplicati/Library/Main/Utility.cs
index fd5c8de06..afdf638a0 100644
--- a/Duplicati/Library/Main/Utility.cs
+++ b/Duplicati/Library/Main/Utility.cs
@@ -182,54 +182,6 @@ namespace Duplicati.Library.Main
                 db.SetDbOptions(newDict, transaction);               
             }
         }
-
-        /// <summary>
-        /// The filename for the marker file that the user can add to suppress donation messages
-        /// </summary>
-        private const string SUPPRESS_DONATIONS_FILENAME = "suppress_donation_messages.txt";
-
-
-        /// <summary>
-        /// Gets or sets donation message suppression
-        /// </summary>
-        public static bool SuppressDonationMessages
-        {
-            get
-            {
-                try
-                {
-                    var folder = Path.Combine(System.Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), AutoUpdater.AutoUpdateSettings.AppName);
-                    return File.Exists(Path.Combine(folder, SUPPRESS_DONATIONS_FILENAME));
-                }
-                catch
-                {
-                }
-
-                return true;
-            }
-            set
-            {
-                try
-                {
-                    var folder = Path.Combine(System.Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), AutoUpdater.AutoUpdateSettings.AppName);
-                    if (!Directory.Exists(folder))
-                        Directory.CreateDirectory(folder);
-
-                    var path = Path.Combine(folder, SUPPRESS_DONATIONS_FILENAME);
-
-                    if (value)
-                        using(File.OpenWrite(path))
-                        {
-                        }
-                    else
-                        File.Delete(path);
-                        
-                }
-                catch
-                {
-                }
-            }
-        }
     }
 }
 
diff --git a/Duplicati/Server/webroot/ngax/index.html b/Duplicati/Server/webroot/ngax/index.html
index 7ddb218ee..5119b6c7e 100755
--- a/Duplicati/Server/webroot/ngax/index.html
+++ b/Duplicati/Server/webroot/ngax/index.html
@@ -148,11 +148,6 @@
                 </div>
             </div>
 
-            <div class="donate" ng-hide="systemInfo.SuppressDonationMessages">
-                <external-link link="'https://www.duplicati.com/donate'">{{'Donate' | translate }}</external-link>
-            </div>
-
-
             <a href class="menubutton hidden" data-target="mainmenu" translate>Menu</a>
 
             <div class="action-icons-small">
@@ -253,13 +248,6 @@
                 </ul>
             </div>
 
-            <div class="donate">
-                <ul>
-                    <li ng-hide="systemInfo.SuppressDonationMessages">
-                        <external-link link="'https://www.duplicati.com/donate'">{{'Donate' | translate}}</external-link>
-                    </li>
-                </ul>
-            </div>
             <div class="social">
                 {{'Visit us on' | translate}}<div class="external-link-image"></div>
                 <ul>
diff --git a/Duplicati/Server/webroot/ngax/less/base.less b/Duplicati/Server/webroot/ngax/less/base.less
index f33f02d08..9080149eb 100644
--- a/Duplicati/Server/webroot/ngax/less/base.less
+++ b/Duplicati/Server/webroot/ngax/less/base.less
@@ -813,31 +813,6 @@ body {
                     }
                 }
             }
-
-            .donate {
-                float: right;
-
-                ul {
-                    overflow: hidden;
-                    float: right;
-                    padding-left: 20px;
-                    padding-right: 10px;
-
-                    li {
-                        float: right;
-                        margin-right: 10px;
-                        padding-top: 5px;
-                    }
-                }
-
-                img {
-                    opacity: 0.6;
-                }
-
-                img:hover {
-                    opacity: 1;
-                }
-            }
         }
 
         .body {
@@ -1861,39 +1836,6 @@ body {
                 }
             }
 
-            .donate {
-                display: none;
-                float: right;
-                padding-right: 40px;
-                overflow: hidden;
-
-                ul {
-                    overflow: hidden;
-                    float: right;
-
-                    li {
-                        float: left;
-                        margin-left: 10px;
-
-                        a {
-                            img {
-                                margin-top: 24px;
-                                display: inline-block;
-                                opacity: 0.6;
-                            }
-
-                            img:hover {
-                                opacity: 1;
-                            }
-                        }
-                    }
-                }
-            }
-
-            .donate > a {
-                float: left;
-            }
-
             .social {
                 float: right;
 
@@ -2517,18 +2459,6 @@ div.modal-dialog {
     }
 }
 
-// Smaller screen sizes
-@media (max-width: 1200px) {
-    body {
-        .container {
-            .header {
-                .donate {
-                }
-            }
-        }
-    }
-}
-
 @media (max-width: 1150px) {
     body {
         .container {
@@ -2596,10 +2526,6 @@ div.modal-dialog {
                         background-image: url('../img/menu_active_3x.png');
                     }
                 }
-
-                .donate {
-                    display: none;
-                }
             }
 
             .body {
@@ -2920,29 +2846,12 @@ div.modal-dialog {
                 }
 
                 li,
-                .donate,
                 .social,
                 .about-footer {
                     padding: 8px 0;
                     border-bottom: 1px #ddd solid;
                 }
 
-                .donate {
-                    display: block;
-
-                    ul {
-                        li {
-                            display: inline-block;
-                            border: none;
-                            margin: 0 5px;
-
-                            a img {
-                                margin-top: 0;
-                            }
-                        }
-                    }
-                }
-
                 .social {
                     li {
                         display: inline-block;
diff --git a/Duplicati/Server/webroot/ngax/scripts/controllers/SystemSettingsController.js b/Duplicati/Server/webroot/ngax/scripts/controllers/SystemSettingsController.js
index 4b57662e1..485a9f853 100644
--- a/Duplicati/Server/webroot/ngax/scripts/controllers/SystemSettingsController.js
+++ b/Duplicati/Server/webroot/ngax/scripts/controllers/SystemSettingsController.js
@@ -116,26 +116,4 @@ backupApp.controller('SystemSettingsController', function($rootScope, $scope, $r
             AppUtils.connectionError(gettextCatalog.getString('Failed to save:') + ' ')
         );
     };
-
-    $scope.suppressDonationMessages = function() {
-        AppService.post('/systeminfo/suppressdonationmessages').then(
-            function() 
-            { 
-                $scope.SystemInfo.SuppressDonationMessages = true; 
-                SystemInfo.notifyChanged();
-            }, 
-            AppUtils.connectionError(gettextCatalog.getString('Operation failed:') + ' ')
-        );
-    };
-
-    $scope.displayDonationMessages = function() {
-        AppService.post('/systeminfo/showdonationmessages').then(
-            function() 
-            { 
-                $scope.SystemInfo.SuppressDonationMessages = false; 
-                SystemInfo.notifyChanged();
-            }, 
-            AppUtils.connectionError(gettextCatalog.getString('Operation failed:') + ' ')
-        );
-    };
 });
diff --git a/Duplicati/Server/webroot/ngax/templates/restore.html b/Duplicati/Server/webroot/ngax/templates/restore.html
index 4d905647f..70b6c8d7e 100644
--- a/Duplicati/Server/webroot/ngax/templates/restore.html
+++ b/Duplicati/Server/webroot/ngax/templates/restore.html
@@ -147,10 +147,6 @@
         <div ng-show="restore_step == 3 &amp;&amp; connecting == false">
             <h3>
                 <div class="hint-text" translate>Your files and folders have been restored successfully.</div>
-                <div ng-hide="SystemInfo.SuppressDonationMessages">
-                    <div id="restore-hint-donate" class="hint-text" translate translate-params-smallamount="'10€'" translate-params-largeamount="'100€'">Did we help save your files? If so, please consider supporting Duplicati with a donation. We suggest {{smallamount}} for private use and {{largeamount}} for commercial use.</div>
-                    <div id="restore-hint-donate" class="hint-text"><a href="https://www.duplicati.com/donate" target="blank" translate>We accept donations via different services, such as OpenCollective, PayPal, BountySource and various crypto currencies.</a></div>
-                </div>
             </h3>
             <div class="buttons">
                 <a href class="submit" ng-click="onClickComplete()" translate>OK</a>
diff --git a/Duplicati/Server/webroot/ngax/templates/settings.html b/Duplicati/Server/webroot/ngax/templates/settings.html
index 46e781c40..051fc727e 100644
--- a/Duplicati/Server/webroot/ngax/templates/settings.html
+++ b/Duplicati/Server/webroot/ngax/templates/settings.html
@@ -73,13 +73,6 @@
             </select>
         </div>
 
-        <h2 translate>Donation messages</h2>
-        <div class="input checkbox">
-            <label for="suppresDonationMessages" translate>Donation messages</label>
-            <a href ng-click="suppressDonationMessages()" ng-show="!SystemInfo.SuppressDonationMessages" translate>Donation messages are visible, click to hide</a>
-            <a href ng-click="displayDonationMessages()" ng-show="SystemInfo.SuppressDonationMessages" translate>Donation messages are hidden, click to show</a>
-        </div>
-
         <h2 translate>Update channel</h2>
         <div class="input checkbox">
             <input type="radio" class="checkbox" id="updateChannelDefault" value="" name="updateChannel" ng-model="updateChannel" />
diff --git a/build-installers.sh b/build-installers.sh
index 0978461f5..282a235e9 100755
--- a/build-installers.sh
+++ b/build-installers.sh
@@ -25,6 +25,8 @@ AUTHENTICODE_PASSWORD="${HOME}/.config/signkeys/Duplicati/authenticode.key"
 MONO=/Library/Frameworks/Mono.framework/Commands/mono
 VBOX_USER=IEUser@192.168.56.102
 
+S3_BUCKET_NAME="updates.duplicati.com"
+
 GPG=/usr/local/bin/gpg2
 
 # Newer GPG needs this to allow input from a non-terminal
@@ -256,7 +258,7 @@ echo "{" > "./tmp/latest-installers.json"
 
 process_installer() {
 	if [ "$2" != "zip" ]; then
-		aws --profile=duplicati-upload s3 cp "${UPDATE_TARGET}/$1" "s3://updates.duplicati.com/${BUILDTYPE}/$1"
+		aws --profile=duplicati-upload s3 cp "${UPDATE_TARGET}/$1" "s3://${S3_BUCKET_NAME}/${BUILDTYPE}/$1"
 	fi
 
 	local MD5=$(md5 ${UPDATE_TARGET}/$1 | awk -F ' ' '{print $NF}')
@@ -293,8 +295,8 @@ echo "duplicati_installers =" > "./tmp/latest-installers.js"
 cat "./tmp/latest-installers.json" >> "./tmp/latest-installers.js"
 echo ";" >> "./tmp/latest-installers.js"
 
-aws --profile=duplicati-upload s3 cp "./tmp/latest-installers.json" "s3://updates.duplicati.com/${BUILDTYPE}/latest-installers.json"
-aws --profile=duplicati-upload s3 cp "./tmp/latest-installers.js" "s3://updates.duplicati.com/${BUILDTYPE}/latest-installers.js"
+aws --profile=duplicati-upload s3 cp "./tmp/latest-installers.json" "s3://${S3_BUCKET_NAME}/${BUILDTYPE}/latest-installers.json"
+aws --profile=duplicati-upload s3 cp "./tmp/latest-installers.js" "s3://${S3_BUCKET_NAME}/${BUILDTYPE}/latest-installers.js"
 
 if [ -d "./tmp" ]; then
 	rm -rf "./tmp"
@@ -324,7 +326,7 @@ cd ..
 mv "./tmp/${SIGNAME}" "${UPDATE_TARGET}/${SIGNAME}"
 rm -rf "./tmp/${SIG_FOLDER}"
 
-aws --profile=duplicati-upload s3 cp "${UPDATE_TARGET}/${SIGNAME}" "s3://updates.duplicati.com/${BUILDTYPE}/${SIGNAME}"
+aws --profile=duplicati-upload s3 cp "${UPDATE_TARGET}/${SIGNAME}" "s3://${S3_BUCKET_NAME}/${BUILDTYPE}/${SIGNAME}"
 
 GITHUB_TOKEN=$(cat "${GITHUB_TOKEN_FILE}")
 
diff --git a/build-release.sh b/build-release.sh
index 4404e3925..adf668cba 100755
--- a/build-release.sh
+++ b/build-release.sh
@@ -20,6 +20,8 @@ RELEASE_FILE_NAME="duplicati-${RELEASE_NAME}"
 
 GIT_STASH_NAME="auto-build-${RELEASE_TIMESTAMP}"
 
+S3_BUCKET_NAME="updates.duplicati.com"
+
 UPDATE_ZIP_URLS="https://updates.duplicati.com/${RELEASE_TYPE}/${RELEASE_FILE_NAME}.zip;https://alt.updates.duplicati.com/${RELEASE_TYPE}/${RELEASE_FILE_NAME}.zip"
 UPDATE_MANIFEST_URLS="https://updates.duplicati.com/${RELEASE_TYPE}/latest.manifest;https://alt.updates.duplicati.com/${RELEASE_TYPE}/latest.manifest"
 UPDATER_KEYFILE="${HOME}/.config/signkeys/Duplicati/updater-release.key"
@@ -301,12 +303,12 @@ cp "${UPDATE_TARGET}/latest.zip.sig.asc" "${UPDATE_TARGET}/${RELEASE_FILE_NAME}.
 "${MONO}" "BuildTools/UpdateVersionStamp/bin/Release/UpdateVersionStamp.exe" --version="${RELEASE_VERSION}"
 
 echo "Uploading binaries"
-"${AWS}" --profile=duplicati-upload s3 cp "${UPDATE_TARGET}/${RELEASE_FILE_NAME}.zip" "s3://updates.duplicati.com/${RELEASE_TYPE}/${RELEASE_FILE_NAME}.zip"
-"${AWS}" --profile=duplicati-upload s3 cp "${UPDATE_TARGET}/${RELEASE_FILE_NAME}.zip.sig" "s3://updates.duplicati.com/${RELEASE_TYPE}/${RELEASE_FILE_NAME}.zip.sig"
-"${AWS}" --profile=duplicati-upload s3 cp "${UPDATE_TARGET}/${RELEASE_FILE_NAME}.zip.sig.asc" "s3://updates.duplicati.com/${RELEASE_TYPE}/${RELEASE_FILE_NAME}.zip.sig.asc"
-"${AWS}" --profile=duplicati-upload s3 cp "${UPDATE_TARGET}/${RELEASE_FILE_NAME}.manifest" "s3://updates.duplicati.com/${RELEASE_TYPE}/${RELEASE_FILE_NAME}.manifest"
+"${AWS}" --profile=duplicati-upload s3 cp "${UPDATE_TARGET}/${RELEASE_FILE_NAME}.zip" "s3://${S3_BUCKET_NAME}/${RELEASE_TYPE}/${RELEASE_FILE_NAME}.zip"
+"${AWS}" --profile=duplicati-upload s3 cp "${UPDATE_TARGET}/${RELEASE_FILE_NAME}.zip.sig" "s3://${S3_BUCKET_NAME}/${RELEASE_TYPE}/${RELEASE_FILE_NAME}.zip.sig"
+"${AWS}" --profile=duplicati-upload s3 cp "${UPDATE_TARGET}/${RELEASE_FILE_NAME}.zip.sig.asc" "s3://${S3_BUCKET_NAME}/${RELEASE_TYPE}/${RELEASE_FILE_NAME}.zip.sig.asc"
+"${AWS}" --profile=duplicati-upload s3 cp "${UPDATE_TARGET}/${RELEASE_FILE_NAME}.manifest" "s3://${S3_BUCKET_NAME}/${RELEASE_TYPE}/${RELEASE_FILE_NAME}.manifest"
 
-"${AWS}" --profile=duplicati-upload s3 cp "s3://updates.duplicati.com/${RELEASE_TYPE}/${RELEASE_FILE_NAME}.manifest" "s3://updates.duplicati.com/${RELEASE_TYPE}/latest.manifest"
+"${AWS}" --profile=duplicati-upload s3 cp "s3://${S3_BUCKET_NAME}/${RELEASE_TYPE}/${RELEASE_FILE_NAME}.manifest" "s3://${S3_BUCKET_NAME}/${RELEASE_TYPE}/latest.manifest"
 
 ZIP_MD5=$(md5 ${UPDATE_TARGET}/${RELEASE_FILE_NAME}.zip | awk -F ' ' '{print $NF}')
 ZIP_SHA1=$(shasum -a 1 ${UPDATE_TARGET}/${RELEASE_FILE_NAME}.zip | awk -F ' ' '{print $1}')
@@ -331,13 +333,13 @@ echo "duplicati_version_info =" > "latest.js"
 cat "latest.json" >> "latest.js"
 echo ";" >> "latest.js"
 
-"${AWS}" --profile=duplicati-upload s3 cp "latest.json" "s3://updates.duplicati.com/${RELEASE_TYPE}/latest.json"
-"${AWS}" --profile=duplicati-upload s3 cp "latest.js" "s3://updates.duplicati.com/${RELEASE_TYPE}/latest.js"
+"${AWS}" --profile=duplicati-upload s3 cp "latest.json" "s3://${S3_BUCKET_NAME}/${RELEASE_TYPE}/latest.json"
+"${AWS}" --profile=duplicati-upload s3 cp "latest.js" "s3://${S3_BUCKET_NAME}/${RELEASE_TYPE}/latest.js"
 
 # echo "Propagating to other build types"
 # for OTHER in ${OTHER_UPLOADS}; do
-# 	aws --profile=duplicati-upload s3 cp "s3://updates.duplicati.com/${RELEASE_TYPE}/${RELEASE_FILE_NAME}.manifest" "s3://updates.duplicati.com/${OTHER}/latest.manifest"
-# 	aws --profile=duplicati-upload s3 cp "s3://updates.duplicati.com/${RELEASE_TYPE}/latest.json" "s3://updates.duplicati.com/${OTHER}/latest.json"
+# 	aws --profile=duplicati-upload s3 cp "s3://${S3_BUCKET_NAME}/${RELEASE_TYPE}/${RELEASE_FILE_NAME}.manifest" "s3://${S3_BUCKET_NAME}/${OTHER}/latest.manifest"
+# 	aws --profile=duplicati-upload s3 cp "s3://${S3_BUCKET_NAME}/${RELEASE_TYPE}/latest.json" "s3://${S3_BUCKET_NAME}/${OTHER}/latest.json"
 # done
 
 rm "${RELEASE_CHANGELOG_NEWS_FILE}"