diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 92acc6ed49d..79ad6762f92 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,9 +2,9 @@ name: Deploy Player
 
 on:
   push:
-    branches: ["master"]
+    branches: ["main"]
   pull_request:
-    branches: ["master"]
+    branches: ["main"]
 
 jobs:
   build:
diff --git a/src/driver/spanner/SpannerDriver.ts b/src/driver/spanner/SpannerDriver.ts
index 6a53fa3cb12..5bd635a52f5 100644
--- a/src/driver/spanner/SpannerDriver.ts
+++ b/src/driver/spanner/SpannerDriver.ts
@@ -139,7 +139,7 @@ export class SpannerDriver implements Driver {
         deleteDateNullable: true,
         version: "int64",
         treeLevel: "int64",
-        migrationId: "int64",
+        migrationId: "string",
         migrationName: "string",
         migrationTimestamp: "int64",
         cacheId: "string",
diff --git a/src/migration/MigrationExecutor.ts b/src/migration/MigrationExecutor.ts
index 625b6c9eedc..3e17691000f 100644
--- a/src/migration/MigrationExecutor.ts
+++ b/src/migration/MigrationExecutor.ts
@@ -1,3 +1,5 @@
+import { v4 as uuidv4 } from "uuid"
+
 import { Table } from "../schema-builder/table/Table"
 import { DataSource } from "../data-source/DataSource"
 import { Migration } from "./Migration"
@@ -464,7 +466,9 @@ export class MigrationExecutor {
                                     .migrationId,
                             }),
                             isGenerated: true,
-                            generationStrategy: "increment",
+                            generationStrategy: this.connection.driver.options.type === "spanner"
+                                ? "uuid"
+                                : "increment",
                             isPrimary: true,
                             isNullable: false,
                         },
@@ -616,6 +620,12 @@ export class MigrationExecutor {
             values["timestamp"] = migration.timestamp
             values["name"] = migration.name
         }
+
+        if(this.connection.driver.options.type === "spanner"){
+            // spanner cannot auto generate id's so need to generate ids when inserting a migration
+            values["id"] = uuidv4()
+        }
+
         if (this.connection.driver.options.type === "mongodb") {
             const mongoRunner = queryRunner as MongoQueryRunner
             await mongoRunner.databaseConnection