diff --git a/pkg/services/cloudmigration/cloudmigrationimpl/snapshot_mgmt.go b/pkg/services/cloudmigration/cloudmigrationimpl/snapshot_mgmt.go
index d9f4020dce0..2b277b237ba 100644
--- a/pkg/services/cloudmigration/cloudmigrationimpl/snapshot_mgmt.go
+++ b/pkg/services/cloudmigration/cloudmigrationimpl/snapshot_mgmt.go
@@ -189,7 +189,7 @@ func (s *Service) buildSnapshot(ctx context.Context, signedInUser *user.SignedIn
 
 	s.log.Debug(fmt.Sprintf("buildSnapshot: generated keys in %d ms", time.Since(start).Milliseconds()))
 
-	// Use GMS public key + the grafana generated private private key to encrypt snapshot files.
+	// Use GMS public key + the grafana generated private key to encrypt snapshot files.
 	snapshotWriter, err := snapshot.NewSnapshotWriter(contracts.AssymetricKeys{
 		Public:  snapshotMeta.EncryptionKey,
 		Private: privateKey[:],
diff --git a/pkg/setting/setting_cloud_migration.go b/pkg/setting/setting_cloud_migration.go
index 66dd1d3c194..1efc88089dd 100644
--- a/pkg/setting/setting_cloud_migration.go
+++ b/pkg/setting/setting_cloud_migration.go
@@ -1,7 +1,7 @@
 package setting
 
 import (
-	"os"
+	"path/filepath"
 	"time"
 )
 
@@ -51,7 +51,6 @@ func (cfg *Cfg) readCloudMigrationSettings() {
 	cfg.CloudMigration.FeedbackURL = cloudMigration.Key("feedback_url").MustString("")
 
 	if cfg.CloudMigration.SnapshotFolder == "" {
-		homeDir, _ := os.UserHomeDir()
-		cfg.CloudMigration.SnapshotFolder = homeDir
+		cfg.CloudMigration.SnapshotFolder = filepath.Join(cfg.DataPath, "cloud_migration")
 	}
 }