diff --git a/pkg/coredata/migrations/20250420T120000Z.sql b/pkg/coredata/migrations/20250420T120000Z.sql
index dc14207c2..59b47ff36 100644
--- a/pkg/coredata/migrations/20250420T120000Z.sql
+++ b/pkg/coredata/migrations/20250420T120000Z.sql
@@ -289,7 +289,7 @@ INSERT INTO peoples (
 )
 SELECT 
     o.tenant_id,
-    encode(generate_gid(decode_base64_unpadded(o.tenant_id), 8), 'base64'),
+    generate_gid(decode_base64_unpadded(o.tenant_id), 8),
     o.id,
     u.fullname,
     u.email_address,
diff --git a/pkg/coredata/migrations/20240421T032700Z.sql b/pkg/coredata/migrations/20250421T032700Z.sql
similarity index 100%
rename from pkg/coredata/migrations/20240421T032700Z.sql
rename to pkg/coredata/migrations/20250421T032700Z.sql
diff --git a/pkg/coredata/migrations/20250424T094500Z.sql b/pkg/coredata/migrations/20250424T094500Z.sql
index bb07169b0..28191860c 100644
--- a/pkg/coredata/migrations/20250424T094500Z.sql
+++ b/pkg/coredata/migrations/20250424T094500Z.sql
@@ -56,5 +56,5 @@ SET current_published_version = 1
 WHERE EXISTS (
     SELECT 1 FROM policy_versions pv 
     WHERE pv.policy_id = p.id 
-    AND pv.status = 'PUBLISHED'
+    AND pv.status = 'ACTIVE'
 );