diff --git a/pkg/coredata/migrations/20250420T120000Z.sql b/pkg/coredata/migrations/20250420T120000Z.sql
index 8c5b905d6..dc14207c2 100644
--- a/pkg/coredata/migrations/20250420T120000Z.sql
+++ b/pkg/coredata/migrations/20250420T120000Z.sql
@@ -95,7 +95,7 @@ $func$ LANGUAGE plpgsql IMMUTABLE;
 
 -- Function to generate a GID
 CREATE OR REPLACE FUNCTION generate_gid(tenant_id bytea, entity_type int)
-RETURNS bytea AS $func$
+RETURNS text AS $func$
 DECLARE
     id bytea;
     timestamp_ms_bytes bytea;
@@ -125,7 +125,8 @@ BEGIN
     random_bytes := gen_random_bytes(6);
     id := id || random_bytes;
     
-    RETURN id;
+    -- Return as URL-safe base64
+    RETURN rtrim(translate(encode(id, 'base64'), '+/', '-_'), '=');
 END;
 $func$ LANGUAGE plpgsql VOLATILE;
 
@@ -248,8 +249,6 @@ BEGIN
 END;
 $$ LANGUAGE plpgsql;
 
-
-
 CREATE TYPE data_sensitivity AS ENUM ('NONE', 'LOW', 'MEDIUM', 'HIGH', 'CRITICAL');
 CREATE TYPE business_impact AS ENUM ('LOW', 'MEDIUM', 'HIGH', 'CRITICAL');