diff --git a/public/app/features/migrate-to-cloud/onprem/MigrationSummary.tsx b/public/app/features/migrate-to-cloud/onprem/MigrationSummary.tsx
index 22742acd860..02fa15f267e 100644
--- a/public/app/features/migrate-to-cloud/onprem/MigrationSummary.tsx
+++ b/public/app/features/migrate-to-cloud/onprem/MigrationSummary.tsx
@@ -63,7 +63,7 @@ export function MigrationSummary(props: MigrationSummaryProps) {
       alignItems="center"
       justifyContent="space-between"
     >
-      <Stack gap={4} wrap="wrap">
+      <Stack gap={4} wrap>
         <MigrationInfo title={t('migrate-to-cloud.summary.snapshot-date', 'Snapshot timestamp')}>
           {snapshot?.created ? (
             formatDate(snapshot.created, DATE_FORMAT)
@@ -101,32 +101,34 @@ export function MigrationSummary(props: MigrationSummaryProps) {
         </MigrationInfo>
       </Stack>
 
-      {showBuildSnapshot && (
-        <Button disabled={isBusy} onClick={onBuildSnapshot} icon={buildSnapshotIsLoading ? 'spinner' : undefined}>
-          <Trans i18nKey="migrate-to-cloud.summary.start-migration">Build snapshot</Trans>
-        </Button>
-      )}
+      <Stack gap={2} wrap justifyContent="flex-end">
+        {showBuildSnapshot && (
+          <Button disabled={isBusy} onClick={onBuildSnapshot} icon={buildSnapshotIsLoading ? 'spinner' : undefined}>
+            <Trans i18nKey="migrate-to-cloud.summary.start-migration">Build snapshot</Trans>
+          </Button>
+        )}
 
-      {showRebuildSnapshot && (
-        <Button
-          disabled={isBusy}
-          onClick={onBuildSnapshot}
-          icon={buildSnapshotIsLoading ? 'spinner' : undefined}
-          variant="secondary"
-        >
-          <Trans i18nKey="migrate-to-cloud.summary.rebuild-snapshot">Rebuild snapshot</Trans>
-        </Button>
-      )}
+        {showRebuildSnapshot && (
+          <Button
+            disabled={isBusy}
+            onClick={onBuildSnapshot}
+            icon={buildSnapshotIsLoading ? 'spinner' : undefined}
+            variant="secondary"
+          >
+            <Trans i18nKey="migrate-to-cloud.summary.rebuild-snapshot">Rebuild snapshot</Trans>
+          </Button>
+        )}
 
-      {showUploadSnapshot && (
-        <Button
-          disabled={isBusy || uploadSnapshotIsLoading}
-          onClick={onUploadSnapshot}
-          icon={uploadSnapshotIsLoading ? 'spinner' : undefined}
-        >
-          <Trans i18nKey="migrate-to-cloud.summary.upload-migration">Upload snapshot</Trans>
-        </Button>
-      )}
+        {showUploadSnapshot && (
+          <Button
+            disabled={isBusy || uploadSnapshotIsLoading}
+            onClick={onUploadSnapshot}
+            icon={uploadSnapshotIsLoading ? 'spinner' : undefined}
+          >
+            <Trans i18nKey="migrate-to-cloud.summary.upload-migration">Upload snapshot</Trans>
+          </Button>
+        )}
+      </Stack>
     </Box>
   );
 }
diff --git a/public/app/features/migrate-to-cloud/onprem/Page.tsx b/public/app/features/migrate-to-cloud/onprem/Page.tsx
index af6396ca485..d8a8989d7b3 100644
--- a/public/app/features/migrate-to-cloud/onprem/Page.tsx
+++ b/public/app/features/migrate-to-cloud/onprem/Page.tsx
@@ -57,7 +57,7 @@ const SHOULD_POLL_STATUSES: Array<SnapshotDto['status']> = [
   'PROCESSING',
 ];
 
-const SNAPSHOT_REBUILD_STATUSES: Array<SnapshotDto['status']> = ['PENDING_PROCESSING', 'FINISHED', 'ERROR', 'UNKNOWN'];
+const SNAPSHOT_REBUILD_STATUSES: Array<SnapshotDto['status']> = ['PENDING_UPLOAD', 'FINISHED', 'ERROR', 'UNKNOWN'];
 const SNAPSHOT_BUILDING_STATUSES: Array<SnapshotDto['status']> = ['INITIALIZING', 'CREATING'];
 const SNAPSHOT_UPLOADING_STATUSES: Array<SnapshotDto['status']> = ['UPLOADING', 'PENDING_PROCESSING', 'PROCESSING'];