diff --git a/initdb/02_1_1_signalk_api_tables.sql b/initdb/02_1_1_signalk_api_tables.sql
index 472e405..e8e9982 100644
--- a/initdb/02_1_1_signalk_api_tables.sql
+++ b/initdb/02_1_1_signalk_api_tables.sql
@@ -8,7 +8,7 @@
 ---------------------------------------------------------------------------
 -- Metadata from signalk
 CREATE TABLE IF NOT EXISTS api.metadata(
-  id SERIAL PRIMARY KEY,
+  id INT PRIMARY KEY GENERATED ALWAYS AS IDENTITY,
   name TEXT NULL,
   mmsi NUMERIC NULL,
   client_id TEXT NULL,
@@ -95,7 +95,7 @@ SELECT create_hypertable('api.metrics', 'time', chunk_time_interval => INTERVAL
 -- Check unused index
 
 CREATE TABLE IF NOT EXISTS api.logbook(
-  id SERIAL PRIMARY KEY,
+  id INT PRIMARY KEY GENERATED ALWAYS AS IDENTITY,
   vessel_id TEXT NOT NULL REFERENCES api.metadata(vessel_id) ON DELETE RESTRICT,
   active BOOLEAN DEFAULT false,
   name TEXT,
@@ -143,7 +143,7 @@ COMMENT ON COLUMN api.logbook.track_geojson IS 'store generated geojson with tra
 -- Stays
 -- virtual logbook by boat? 
 CREATE TABLE IF NOT EXISTS api.stays(
-  id SERIAL PRIMARY KEY,
+  id INT PRIMARY KEY GENERATED ALWAYS AS IDENTITY,
   vessel_id TEXT NOT NULL REFERENCES api.metadata(vessel_id) ON DELETE RESTRICT,
   active BOOLEAN DEFAULT false,
   moorage_id INT NULL,
@@ -174,7 +174,7 @@ COMMENT ON COLUMN api.stays.duration IS 'Best to use standard ISO 8601';
 -- Moorages
 -- virtual logbook by boat? 
 CREATE TABLE IF NOT EXISTS api.moorages(
-  id SERIAL PRIMARY KEY,
+  id INT PRIMARY KEY GENERATED ALWAYS AS IDENTITY,
   vessel_id TEXT NOT NULL REFERENCES api.metadata(vessel_id) ON DELETE RESTRICT,
   name TEXT,
   country TEXT,
diff --git a/initdb/02_3_1_signalk_public_tables.sql b/initdb/02_3_1_signalk_public_tables.sql
index c34641c..fd153a7 100644
--- a/initdb/02_3_1_signalk_public_tables.sql
+++ b/initdb/02_3_1_signalk_public_tables.sql
@@ -150,7 +150,7 @@ INSERT INTO public.email_templates VALUES
 
 -- table way
 CREATE TABLE IF NOT EXISTS public.process_queue (
-    id SERIAL PRIMARY KEY,
+    id INT PRIMARY KEY GENERATED ALWAYS AS IDENTITY,
     channel TEXT NOT NULL,
     payload TEXT NOT NULL,
     ref_id TEXT NOT NULL,
diff --git a/initdb/07naturalearthdata.sql b/initdb/07naturalearthdata.sql
index b3a9868..c760e5d 100644
--- a/initdb/07naturalearthdata.sql
+++ b/initdb/07naturalearthdata.sql
@@ -18,7 +18,7 @@ select current_database();
 \c signalk
 
 CREATE TABLE public.ne_10m_geography_marine_polys (
-	gid serial4 NOT NULL,
+	gid INT GENERATED ALWAYS AS IDENTITY NOT NULL,
 	featurecla TEXT NULL,
 	"name" TEXT NULL,
 	namealt TEXT NULL,