diff --git a/docker-compose.yml b/docker-compose.yml
index c1046ddeb..c2cd70aa9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 services:
   postgres:
     container_name: postgres
-    image: ghcr.io/constructive-io/docker/postgres-plus:17
+    image: docker.io/constructiveio/postgres-plus:18
     environment:
       - POSTGRES_USER=postgres
       - POSTGRES_PASSWORD=password
diff --git a/graphile/graphile-sql-expression-validator/__tests__/validator.test.ts b/graphile/graphile-sql-expression-validator/__tests__/validator.test.ts
index d41a4fad3..6d3a26fe4 100644
--- a/graphile/graphile-sql-expression-validator/__tests__/validator.test.ts
+++ b/graphile/graphile-sql-expression-validator/__tests__/validator.test.ts
@@ -10,6 +10,7 @@ describe('DEFAULT_ALLOWED_FUNCTIONS', () => {
     expect(DEFAULT_ALLOWED_FUNCTIONS).toEqual([
       'uuid_generate_v4',
       'gen_random_uuid',
+      'uuidv7',
       'now',
       'clock_timestamp',
       'statement_timestamp',
@@ -20,8 +21,8 @@ describe('DEFAULT_ALLOWED_FUNCTIONS', () => {
     ]);
   });
 
-  it('should have exactly 9 functions', () => {
-    expect(DEFAULT_ALLOWED_FUNCTIONS).toHaveLength(9);
+  it('should have exactly 10 functions', () => {
+    expect(DEFAULT_ALLOWED_FUNCTIONS).toHaveLength(10);
   });
 
   it('should NOT contain setseed (makes random() predictable)', () => {
diff --git a/graphile/graphile-sql-expression-validator/src/validator.ts b/graphile/graphile-sql-expression-validator/src/validator.ts
index 60216c7be..f6cb344d3 100644
--- a/graphile/graphile-sql-expression-validator/src/validator.ts
+++ b/graphile/graphile-sql-expression-validator/src/validator.ts
@@ -64,6 +64,7 @@ interface AstNodeValidationResult {
 export const DEFAULT_ALLOWED_FUNCTIONS = [
   'uuid_generate_v4',
   'gen_random_uuid',
+  'uuidv7',
   'now',
   'clock_timestamp',
   'statement_timestamp',
diff --git a/pgpm/core/src/export/export-migrations.ts b/pgpm/core/src/export/export-migrations.ts
index cde04e545..6a54356a3 100644
--- a/pgpm/core/src/export/export-migrations.ts
+++ b/pgpm/core/src/export/export-migrations.ts
@@ -29,7 +29,6 @@ const DB_REQUIRED_EXTENSIONS = [
   'vector',
   'metaschema-schema',
   'pgpm-inflection',
-  'pgpm-uuid',
   'pgpm-utils',
   'pgpm-database-jobs',
   'pgpm-jwt-claims',
diff --git a/pgpm/core/src/modules/modules.ts b/pgpm/core/src/modules/modules.ts
index 0a266f314..e6319f8dc 100644
--- a/pgpm/core/src/modules/modules.ts
+++ b/pgpm/core/src/modules/modules.ts
@@ -19,8 +19,7 @@ export const PGPM_MODULE_MAP: Record<string, string> = {
   'pgpm-stamps': '@pgpm/stamps',
   'pgpm-totp': '@pgpm/totp',
   'pgpm-types': '@pgpm/types',
-  'pgpm-utils': '@pgpm/utils',
-  'pgpm-uuid': '@pgpm/uuid'
+  'pgpm-utils': '@pgpm/utils'
 };
 
 /**