diff --git a/src/js/restore.js b/src/js/restore.js
index e7bad6e01..8753bf56e 100644
--- a/src/js/restore.js
+++ b/src/js/restore.js
@@ -169,6 +169,7 @@ app.controller('RestoreController', ['$scope', 'Client', function ($scope, Clien
         { name: 'S3 API Compatible (v4)', value: 's3-v4-compat' },
         { name: 'Scaleway Object Storage', value: 'scaleway-objectstorage' },
         { name: 'SSHFS Mount', value: 'sshfs' },
+        { name: 'UpCloud Object Storage', value: 'upcloud-objectstorage' },
         { name: 'Vultr Object Storage', value: 'vultr-objectstorage' },
         { name: 'Wasabi', value: 'wasabi' }
     ];
@@ -182,7 +183,7 @@ app.controller('RestoreController', ['$scope', 'Client', function ($scope, Clien
         return provider === 's3' || provider === 'minio' || provider === 's3-v4-compat' || provider === 'exoscale-sos'
             || provider === 'digitalocean-spaces' || provider === 'wasabi' || provider === 'scaleway-objectstorage'
             || provider === 'linode-objectstorage' || provider === 'ovh-objectstorage' || provider === 'backblaze-b2'
-            || provider === 'ionos-objectstorage' || provider === 'vultr-objectstorage';
+            || provider === 'ionos-objectstorage' || provider === 'vultr-objectstorage' || provider === 'upcloud-objectstorage';
     };
 
     $scope.mountlike = function (provider) {
@@ -237,6 +238,10 @@ app.controller('RestoreController', ['$scope', 'Client', function ($scope, Clien
             } else if (backupConfig.provider === 'vultr-objectstorage') {
                 backupConfig.region = $scope.vultrRegions.find(function (x) { return x.value === $scope.endpoint; }).region;
                 backupConfig.signatureVersion = 'v4';
+            } else if (backupConfig.provider === 'upcloud-objectstorage') {
+                var m = /^.*\.(.*)\.upcloudobjects.com$/.exec(backupConfig.endpoint);
+                backupConfig.region = m ? m[1] : 'us-east-1'; // let it fail in validation phase if m is not valid
+                backupConfig.signatureVersion = 'v4';
             } else if (backupConfig.provider === 'digitalocean-spaces') {
                 backupConfig.region = 'us-east-1';
             }
diff --git a/src/restore.html b/src/restore.html
index ea95ba485..f63f61c23 100644
--- a/src/restore.html
+++ b/src/restore.html
@@ -154,9 +154,9 @@
                                 </div>
 
                                 <!-- S3/Minio/SOS -->
-                                <div class="form-group" ng-class="{ 'has-error': error.endpoint }" ng-show="provider === 'minio' || provider === 'backblaze-b2' || provider === 's3-v4-compat'">
+                                <div class="form-group" ng-class="{ 'has-error': error.endpoint }" ng-show="provider === 'minio' || provider === 'upcloud-objectstorage' || provider === 'backblaze-b2' || provider === 's3-v4-compat'">
                                     <label class="control-label" for="inputConfigureBackupEndpoint">Endpoint</label>
-                                    <input type="text" class="form-control" ng-model="endpoint" id="inputConfigureBackupEndpoint" name="endpoint" ng-disabled="busy" placeholder="URL" ng-required="provider === 'minio' || provider === 'backblaze-b2' || provider === 's3-v4-compat'">
+                                    <input type="text" class="form-control" ng-model="endpoint" id="inputConfigureBackupEndpoint" name="endpoint" ng-disabled="busy" placeholder="URL" ng-required="provider === 'minio' || provider === 'upcloud-objectstorage' || provider === 'backblaze-b2' || provider === 's3-v4-compat'">
                                 </div>
 
                                 <div class="checkbox" ng-show="provider === 'minio' || provider === 's3-v4-compat'" >
diff --git a/src/views/app.html b/src/views/app.html
index c5e41756c..8648f7fe8 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -215,9 +215,9 @@
           </div>
 
           <!-- S3/Minio/SOS/GCS -->
-          <div class="form-group" ng-class="{ 'has-error': importBackup.error.endpoint }" ng-show="importBackup.provider === 'minio' || importBackup.provider === 'backblaze-b2' || importBackup.provider === 's3-v4-compat'">
+          <div class="form-group" ng-class="{ 'has-error': importBackup.error.endpoint }" ng-show="importBackup.provider === 'minio' || importBackup.provider === 'upcloud-objectstorage' || importBackup.provider === 'backblaze-b2' || importBackup.provider === 's3-v4-compat'">
             <label class="control-label" for="inputimportBackupEndpoint">{{ 'backups.configureBackupStorage.s3Endpoint' | tr }}</label>
-            <input type="text" class="form-control" ng-model="importBackup.endpoint" id="inputimportBackupEndpoint" name="endpoint" ng-disabled="importBackup.busy" placeholder="URL" ng-required="importBackup.provider === 'minio' || importBackup.provider === 'backblaze-b2' || importBackup.provider === 's3-v4-compat'">
+            <input type="text" class="form-control" ng-model="importBackup.endpoint" id="inputimportBackupEndpoint" name="endpoint" ng-disabled="importBackup.busy" placeholder="URL" ng-required="importBackup.provider === 'minio' || importBackup.provider === 'upcloud-objectstorage'|| importBackup.provider === 'backblaze-b2' || importBackup.provider === 's3-v4-compat'">
           </div>
 
           <div class="checkbox" ng-show="importBackup.provider === 'minio' || importBackup.provider === 's3-v4-compat'" >
diff --git a/src/views/app.js b/src/views/app.js
index 72f77f6a1..18a19a308 100644
--- a/src/views/app.js
+++ b/src/views/app.js
@@ -107,6 +107,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
         { name: 'S3 API Compatible (v4)', value: 's3-v4-compat' },
         { name: 'Scaleway Object Storage', value: 'scaleway-objectstorage' },
         { name: 'SSHFS Mount', value: 'sshfs' },
+        { name: 'UpCloud Object Storage', value: 'upcloud-objectstorage' },
         { name: 'Vultr Object Storage', value: 'vultr-objectstorage' },
         // { name: 'No-op (Only for testing)', value: 'noop' },
         { name: 'Wasabi', value: 'wasabi' }
@@ -1048,7 +1049,8 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
         return provider === 's3' || provider === 'minio' || provider === 's3-v4-compat' ||
                provider === 'exoscale-sos' || provider === 'digitalocean-spaces' ||
                provider === 'scaleway-objectstorage' || provider === 'wasabi' || provider === 'backblaze-b2' ||
-               provider === 'linode-objectstorage' || provider === 'ovh-objectstorage' || provider === 'ionos-objectstorage' || provider === 'vultr-objectstorage';
+               provider === 'linode-objectstorage' || provider === 'ovh-objectstorage' || provider === 'ionos-objectstorage'
+               || provider === 'vultr-objectstorage' || provider === 'upcloud-objectstorage';
     };
 
     $scope.mountlike = function (provider) {
@@ -1141,6 +1143,10 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
                 } else if (backupConfig.provider === 'vultr-objectstorage') {
                     backupConfig.region = $scope.vultrRegions.find(function (x) { return x.value === $scope.importBackup.endpoint; }).region;
                     backupConfig.signatureVersion = 'v4';
+                } else if (backupConfig.provider === 'upcloud-objectstorage') {
+                    var m = /^.*\.(.*)\.upcloudobjects.com$/.exec(backupConfig.endpoint);
+                    backupConfig.region = m ? m[1] : 'us-east-1'; // let it fail in validation phase if m is not valid
+                    backupConfig.signatureVersion = 'v4';
                 } else if (backupConfig.provider === 'digitalocean-spaces') {
                     backupConfig.region = 'us-east-1';
                 }
diff --git a/src/views/backups.html b/src/views/backups.html
index b7e8187f5..71070fad0 100644
--- a/src/views/backups.html
+++ b/src/views/backups.html
@@ -198,10 +198,10 @@
             </label>
           </div>
 
-          <!-- S3/Minio/SOS/GCS -->
-          <div class="form-group" ng-class="{ 'has-error': configureBackup.error.endpoint }" ng-show="configureBackup.provider === 'minio' || configureBackup.provider === 'backblaze-b2' || configureBackup.provider === 's3-v4-compat'">
+          <!-- S3/Minio/SOS/GCS/UpCloud -->
+          <div class="form-group" ng-class="{ 'has-error': configureBackup.error.endpoint }" ng-show="configureBackup.provider === 'minio' || configureBackup.provider === 'upcloud-objectstorage' || configureBackup.provider === 'backblaze-b2' || configureBackup.provider === 's3-v4-compat'">
             <label class="control-label" for="inputConfigureBackupEndpoint">{{ 'backups.configureBackupStorage.s3Endpoint' | tr }}</label>
-            <input type="text" class="form-control" ng-model="configureBackup.endpoint" id="inputConfigureBackupEndpoint" name="endpoint" ng-disabled="configureBackup.busy" placeholder="URL" ng-required="configureBackup.provider === 'minio' || configureBackup.provider === 'backblaze-b2' || configureBackup.provider === 's3-v4-compat'">
+            <input type="text" class="form-control" ng-model="configureBackup.endpoint" id="inputConfigureBackupEndpoint" name="endpoint" ng-disabled="configureBackup.busy" placeholder="URL" ng-required="configureBackup.provider === 'minio' || configureBackup.provider === 'upcloud-objectstorage' || configureBackup.provider === 'backblaze-b2' || configureBackup.provider === 's3-v4-compat'">
           </div>
 
           <div class="checkbox" ng-show="configureBackup.provider === 'minio' || configureBackup.provider === 's3-v4-compat'" >
diff --git a/src/views/backups.js b/src/views/backups.js
index 75009beb7..aef073d70 100644
--- a/src/views/backups.js
+++ b/src/views/backups.js
@@ -90,6 +90,21 @@ angular.module('Application').controller('BackupsController', ['$scope', '$locat
         { name: 'DE', value: 'https://s3-de-central.profitbricks.com', region: 's3-de-central' }, // default
     ];
 
+    // this is not used anywhere because upcloud needs endpoint URL. we detect region from the URL
+    $scope.upcloudRegions = [
+        { name: 'AU-SYD1 (Australia)', value: 'https://au-syd1.upcloudobjects.com', region: 'au-syd1' }, // default
+        { name: 'DE-FRA1 (Germany)', value: 'https://de-fra1.upcloudobjects.com', region: 'de-fra1' },
+        { name: 'ES-MAD1 (Spain)', value: 'https://es-mad1.upcloudobjects.com', region: 'es-mad1' },
+        { name: 'FI-HEL2 (Finland)', value: 'https://fi-hel2.upcloudobjects.com', region: 'fi-hel2' },
+        { name: 'NL-AMS1 (Netherlands)', value: 'https://nl-ams1.upcloudobjects.com', region: 'nl-ams1' },
+        { name: 'PL-WAW1 (Poland)', value: 'https://pl-waw1.upcloudobjects.com', region: 'pl-waw1' },
+        { name: 'SG-SIN1 (Singapore)', value: 'https://sg-sin1.upcloudobjects.com', region: 'sg-sin1' },
+        { name: 'UK-LON1 (United Kingdom)', value: 'https://uk-lon1.upcloudobjects.com', region: 'uk-lon1' },
+        { name: 'US-CHI1 (USA)', value: 'https://us-chi1.upcloudobjects.com', region: 'us-chi1' },
+        { name: 'US-NYC1 (USA)', value: 'https://us-nyc1.upcloudobjects.com', region: 'us-nyc1' },
+        { name: 'US-SJO1 (USA)', value: 'https://us-sjo1.upcloudobjects.com', region: 'us-sjo1' },
+    ];
+
     $scope.vultrRegions = [
         { name: 'New Jersey', value: 'https://ewr1.vultrobjects.com', region: 'us-east-1' }, // default
     ];
@@ -112,6 +127,7 @@ angular.module('Application').controller('BackupsController', ['$scope', '$locat
         { name: 'S3 API Compatible (v4)', value: 's3-v4-compat' },
         { name: 'Scaleway Object Storage', value: 'scaleway-objectstorage' },
         { name: 'SSHFS Mount', value: 'sshfs' },
+        { name: 'UpCloud Object Storage', value: 'upcloud-objectstorage' },
         { name: 'Vultr Object Storage', value: 'vultr-objectstorage' },
         { name: 'Wasabi', value: 'wasabi' },
         { name: 'No-op (Only for testing)', value: 'noop' }
@@ -289,7 +305,8 @@ angular.module('Application').controller('BackupsController', ['$scope', '$locat
         return provider === 's3' || provider === 'minio' || provider === 's3-v4-compat'
             || provider === 'exoscale-sos' || provider === 'digitalocean-spaces'
             || provider === 'scaleway-objectstorage' || provider === 'wasabi' || provider === 'backblaze-b2'
-            || provider === 'linode-objectstorage' || provider === 'ovh-objectstorage' || provider === 'ionos-objectstorage' || provider === 'vultr-objectstorage';
+            || provider === 'linode-objectstorage' || provider === 'ovh-objectstorage' || provider === 'ionos-objectstorage'
+            || provider === 'vultr-objectstorage' || provider === 'upcloud-objectstorage';
     };
 
     $scope.mountlike = function (provider) {
@@ -580,6 +597,10 @@ angular.module('Application').controller('BackupsController', ['$scope', '$locat
                 } else if (backupConfig.provider === 'vultr-objectstorage') {
                     backupConfig.region = $scope.vultrRegions.find(function (x) { return x.value === $scope.configureBackup.endpoint; }).region;
                     backupConfig.signatureVersion = 'v4';
+                } else if (backupConfig.provider === 'upcloud-objectstorage') { // the UI sets region and endpoint
+                    var m = /^.*\.(.*)\.upcloudobjects.com$/.exec(backupConfig.endpoint);
+                    backupConfig.region = m ? m[1] : 'us-east-1'; // let it fail in validation phase if m is not valid
+                    backupConfig.signatureVersion = 'v4';
                 } else if (backupConfig.provider === 'digitalocean-spaces') {
                     backupConfig.region = 'us-east-1';
                 }