diff --git a/dashboard/src/components/SystemUpdate.vue b/dashboard/src/components/SystemUpdate.vue
index ba00a99fb..f7bbc47e8 100644
--- a/dashboard/src/components/SystemUpdate.vue
+++ b/dashboard/src/components/SystemUpdate.vue
@@ -322,11 +322,11 @@ onMounted(async () => {
       <p v-html="$t('settings.updates.description')"></p>
 
       <SettingsItem>
-        <FormGroup>
+        <div>
           <label>{{ $t('settings.updates.schedule') }}</label>
           <span v-if="currentPattern !== 'never'">{{ prettyAutoUpdateSchedule(currentPattern) || '-' }}</span>
           <span v-else>{{ $t('settings.updates.disabled') }}</span>
-        </FormGroup>
+        </div>
         <div style="display: flex; align-items: center">
           <Button tool plain @click="onShowConfigure()">{{ $t('main.dialog.edit') }}</Button>
         </div>
diff --git a/dashboard/src/views/SystemLocaleView.vue b/dashboard/src/views/SystemLocaleView.vue
index 6b86af46c..087b5dcc8 100644
--- a/dashboard/src/views/SystemLocaleView.vue
+++ b/dashboard/src/views/SystemLocaleView.vue
@@ -99,20 +99,20 @@ onMounted(async () => {
   <div class="content">
     <Section :title="$t('system.locale.title')" :padding="false">
       <SettingsItem wrap>
-        <FormGroup>
+        <div>
           <label>{{ $t('settings.timezone.title') }}</label>
           <div v-html="$t('settings.timezone.description', { timeZone })"></div>
-        </FormGroup>
+        </div>
         <div style="display: flex; gap: 6px; align-items: center;">
           <SingleSelect style="min-width: 160px" v-model="timeZone" :searchThreshold="10" :options="allTimezones" option-key="id" option-label="id" @select="onTimeZoneChange" />
         </div>
       </SettingsItem>
 
       <SettingsItem wrap>
-        <FormGroup>
+        <div>
           <label>{{ $t('settings.language.title') }}</label>
           <div>{{ $t('settings.language.description') }}</div>
-        </FormGroup>
+        </div>
         <div style="display: flex; gap: 6px; align-items: center;">
           <SingleSelect v-model="language" :options="allLanguages" option-key="id" option-label="display" @select="onLanguageChange" />
         </div>
diff --git a/dashboard/src/views/SystemUpdateView.vue b/dashboard/src/views/SystemUpdateView.vue
index 4d1e9e9e2..7b6c03cc4 100644
--- a/dashboard/src/views/SystemUpdateView.vue
+++ b/dashboard/src/views/SystemUpdateView.vue
@@ -1,11 +1,53 @@
 <script setup>
 
+import { ref, onMounted } from 'vue';
+import { SingleSelect } from '@cloudron/pankow';
 import SystemUpdate from '../components/SystemUpdate.vue';
+import Section from '../components/Section.vue';
+import SettingsItem from '../components/SettingsItem.vue';
+import BackupTargetsModel from '../models/BackupTargetsModel.js';
+
+const backupTargetsModel = BackupTargetsModel.create();
+
+const targets = ref([]);
+const primaryTargetId = ref('');
+const primaryTargetChangeBusy = ref(false);
+
+async function onPrimaryTargetChanged(value) {
+  primaryTargetChangeBusy.value = true;
+
+  const [error] = await backupTargetsModel.setPrimary(value);
+  if (error) return console.error(error);
+
+  primaryTargetId.value = value;
+  primaryTargetChangeBusy.value = false;
+}
+
+onMounted(async () => {
+  const [error, result] = await backupTargetsModel.list();
+  if (error) return console.error(error);
+
+  primaryTargetId.value = result.find(t => t.primary)?.id;
+
+  targets.value = result;
+});
 
 </script>
 
 <template>
   <div class="content">
     <SystemUpdate />
+
+    <Section title="Backups for Updates">
+      <SettingsItem>
+        <div>
+          <label>Storage</label>
+          <div>For backups created for automatic or manual updates</div>
+        </div>
+        <div style="display: flex; align-items: center">
+          <SingleSelect style="min-width: 160px" :disabled="primaryTargetChangeBusy" v-model="primaryTargetId" :searchThreshold="10" :options="targets" option-key="id" option-label="name" @select="onPrimaryTargetChanged" />
+        </div>
+      </SettingsItem>
+    </Section>
   </div>
 </template>