diff --git a/Dockerfile b/Dockerfile
index e0c285a..aca0e48 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,6 +8,7 @@ ADD pkgs/ /app/pkgs/
 ADD testdata/ /app/testdata/
 ADD templates/ /app/templates/
 ADD leaflet/ /app/leaflet/
+ADD dbmigrations/ /app/dbmigrations/
 RUN go test -cover ./...
 RUN go build -ldflags '-w -s' -o GoBlog
 
diff --git a/databaseMigrations.go b/databaseMigrations.go
index f7fdf79..e44e21b 100644
--- a/databaseMigrations.go
+++ b/databaseMigrations.go
@@ -2,255 +2,49 @@ package main
 
 import (
 	"database/sql"
+	"embed"
+	"io/fs"
 	"log"
+	"strings"
 
 	"github.com/lopezator/migrator"
 )
 
+//go:embed dbmigrations/*
+var dbMigrations embed.FS
+
 func migrateDb(db *sql.DB, logging bool) error {
+	var sqlMigrations []interface{}
+	err := fs.WalkDir(dbMigrations, "dbmigrations", func(path string, d fs.DirEntry, err error) error {
+		if err != nil || d.Type().IsDir() {
+			return err
+		}
+		mig := &migrator.Migration{}
+		mig.Name = strings.TrimSuffix(d.Name(), ".sql")
+		fd, fe := dbMigrations.ReadFile(path)
+		if fe != nil {
+			return fe
+		}
+		if len(fd) == 0 {
+			return nil
+		}
+		mig.Func = func(t *sql.Tx) error {
+			_, txe := t.Exec(string(fd))
+			return txe
+		}
+		sqlMigrations = append(sqlMigrations, mig)
+		return nil
+	})
+	if err != nil {
+		return err
+	}
 	m, err := migrator.New(
 		migrator.WithLogger(migrator.LoggerFunc(func(s string, i ...interface{}) {
 			if logging {
 				log.Printf(s, i)
 			}
 		})),
-		migrator.Migrations(
-			&migrator.Migration{
-				Name: "00001",
-				Func: func(tx *sql.Tx) error {
-					_, err := tx.Exec(`
-					create table posts (path text not null primary key, content text, published text, updated text, blog text not null, section text);
-					create table post_parameters (id integer primary key autoincrement, path text not null, parameter text not null, value text);
-					create index index_pp_path on post_parameters (path);
-					create trigger after delete on posts begin delete from post_parameters where path = old.path; end;
-					create table indieauthauth (time text not null, code text not null, me text not null, client text not null, redirect text not null, scope text not null);
-					create table indieauthtoken (time text not null, token text not null, me text not null, client text not null, scope text not null);
-					create index index_iat_token on indieauthtoken (token);
-					create table autocert (key text not null primary key, data blob not null, created text not null);
-					create table activitypub_followers (blog text not null, follower text not null, inbox text not null, primary key (blog, follower));
-					create table webmentions (id integer primary key autoincrement, source text not null, target text not null, created integer not null, status text not null default "new", title text, content text, author text, type text, unique(source, target));
-					create index index_wm_target on webmentions (target);
-					`)
-					return err
-				},
-			},
-			&migrator.Migration{
-				Name: "00002",
-				Func: func(tx *sql.Tx) error {
-					_, err := tx.Exec(`
-					drop table autocert;
-					`)
-					return err
-				},
-			},
-			&migrator.Migration{
-				Name: "00003",
-				Func: func(tx *sql.Tx) error {
-					_, err := tx.Exec(`
-					drop trigger AFTER;
-					create trigger trigger_posts_delete_pp after delete on posts begin delete from post_parameters where path = old.path; end;
-					`)
-					return err
-				},
-			},
-			&migrator.Migration{
-				Name: "00004",
-				Func: func(tx *sql.Tx) error {
-					_, err := tx.Exec(`
-					create view view_posts_with_title as select id, path, title, content, published, updated, blog, section from (select p.rowid as id, p.path as path, pp.value as title, content, published, updated, blog, section from posts p left outer join post_parameters pp on p.path = pp.path where pp.parameter = 'title');
-					create virtual table posts_fts using fts5(path unindexed, title, content, published unindexed, updated unindexed, blog unindexed, section unindexed, content=view_posts_with_title, content_rowid=id);
-					insert into posts_fts(posts_fts) values ('rebuild');
-					`)
-					return err
-				},
-			},
-			&migrator.Migration{
-				Name: "00005",
-				Func: func(tx *sql.Tx) error {
-					_, err := tx.Exec(`
-					drop view view_posts_with_title;
-					create view view_posts_with_title as select id, path, title, content, published, updated, blog, section from (select p.rowid as id, p.path as path, pp.value as title, content, published, updated, blog, section from posts p left outer join (select * from post_parameters where parameter = 'title') pp on p.path = pp.path);
-					insert into posts_fts(posts_fts) values ('rebuild');
-					`)
-					return err
-				},
-			},
-			&migrator.Migration{
-				Name: "00006",
-				Func: func(tx *sql.Tx) error {
-					_, err := tx.Exec(`
-					create table indieauthauthnew (time text not null, code text not null, client text not null, redirect text not null, scope text not null);
-					insert into indieauthauthnew (time, code, client, redirect, scope) select time, code, client, redirect, scope from indieauthauth;
-					drop table indieauthauth;
-					alter table indieauthauthnew rename to indieauthauth;
-					create table indieauthtokennew (time text not null, token text not null, client text not null, scope text not null);
-					insert into indieauthtokennew (time, token, client, scope) select time, token, client, scope from indieauthtoken;
-					drop table indieauthtoken;
-					alter table indieauthtokennew rename to indieauthtoken;
-					`)
-					return err
-				},
-			},
-			&migrator.Migration{
-				Name: "00007",
-				Func: func(tx *sql.Tx) error {
-					// Change all dates to local
-					_, err := tx.Exec(`
-					update posts set published = tolocal(published), updated = tolocal(updated);
-					`)
-					return err
-				},
-			},
-			&migrator.Migration{
-				Name: "00008",
-				Func: func(tx *sql.Tx) error {
-					_, err := tx.Exec(`
-					create table shortpath (id integer primary key autoincrement, path text not null, unique(path));
-					`)
-					return err
-				},
-			},
-			&migrator.Migration{
-				Name: "00009",
-				Func: func(tx *sql.Tx) error {
-					_, err := tx.Exec(`
-					alter table posts add status text;
-					update posts set status = 'published';
-					drop view view_posts_with_title;
-					drop table posts_fts;
-					create view view_posts_with_title as select id, path, title, content, published, updated, blog, section, status from (select p.rowid as id, p.path as path, pp.value as title, content, published, updated, blog, section, status from posts p left outer join post_parameters pp on p.path = pp.path where pp.parameter = 'title');
-					create virtual table posts_fts using fts5(path unindexed, title, content, published unindexed, updated unindexed, blog unindexed, section unindexed, status unindexed, content=view_posts_with_title, content_rowid=id);
-					insert into posts_fts(posts_fts) values ('rebuild');
-					`)
-					return err
-				},
-			},
-			&migrator.Migration{
-				Name: "00010",
-				Func: func(tx *sql.Tx) error {
-					_, err := tx.Exec(`
-					create table comments (id integer primary key autoincrement, target text not null, name text not null, website text not null, comment text not null);
-					`)
-					return err
-				},
-			},
-			&migrator.Migration{
-				Name: "00011",
-				Func: func(tx *sql.Tx) error {
-					_, err := tx.Exec(`
-					create table notifications (id integer primary key autoincrement, time integer not null, text text not null);
-					`)
-					return err
-				},
-			},
-			&migrator.Migration{
-				Name: "00012",
-				Func: func(tx *sql.Tx) error {
-					_, err := tx.Exec(`
-					create table persistent_cache (key text primary key, data blob, date text not null);
-					`)
-					return err
-				},
-			},
-			&migrator.Migration{
-				Name: "00013",
-				Func: func(tx *sql.Tx) error {
-					_, err := tx.Exec(`
-					create table sessions (id integer primary key autoincrement, data text default '', created text default '', modified datetime default '', expires text default '');
-					`)
-					return err
-				},
-			},
-			&migrator.Migration{
-				Name: "00014",
-				Func: func(tx *sql.Tx) error {
-					_, err := tx.Exec(`
-					create table queue (id integer primary key autoincrement, name text not null, content blob, schedule text not null);
-					`)
-					return err
-				},
-			},
-			&migrator.Migration{
-				Name: "00015",
-				Func: func(tx *sql.Tx) error {
-					_, err := tx.Exec(`
-					drop view view_posts_with_title;
-					create view view_posts_with_title as select p.rowid as id, p.path as path, coalesce(pp.value, '') as title, content, published, updated, blog, section, status from posts p left outer join (select * from post_parameters pp where pp.parameter = 'title') pp on p.path = pp.path;
-					insert into posts_fts(posts_fts) values ('rebuild');
-					`)
-					return err
-				},
-			},
-			&migrator.Migration{
-				Name: "00016",
-				Func: func(tx *sql.Tx) error {
-					_, err := tx.Exec(`
-					create index index_queue_name on queue (name);
-					create index index_queue_schedule on queue (schedule);
-					`)
-					return err
-				},
-			},
-			&migrator.Migration{
-				Name: "00017",
-				Func: func(tx *sql.Tx) error {
-					_, err := tx.Exec(`
-					create index index_post_parameters on post_parameters (path, parameter, value);
-					create index index_queue on queue (name, schedule);
-					drop index index_pp_path;
-					drop index index_queue_name;
-					drop index index_queue_schedule;
-					drop view view_posts_with_title;
-					create table posts_new (path text not null primary key, content text, published text, updated text, blog text not null, section text, status text not null, priority integer not null default 0);
-					insert into posts_new select *, 0 from posts;
-					drop table posts;
-					alter table posts_new rename to posts;
-					create view view_posts_with_title as select p.rowid as id, p.path as path, coalesce(pp.value, '') as title, content, published, updated, blog, section, status, priority from posts p left outer join (select * from post_parameters pp where pp.parameter = 'title') pp on p.path = pp.path;
-					drop table posts_fts;
-					create virtual table posts_fts using fts5(path unindexed, title, content, published unindexed, updated unindexed, blog unindexed, section unindexed, status unindexed, priority unindexed, content=view_posts_with_title, content_rowid=id);
-					insert into posts_fts(posts_fts) values ('rebuild');
-					create index index_posts_status on posts (status);
-					create index index_posts_blog on posts (blog);
-					create index index_posts_section on posts (section);
-					create index index_posts_published on posts (published);
-					create index index_posts_priority on posts (published);
-					drop trigger if exists trigger_posts_delete_pp;
-					`)
-					return err
-				},
-			},
-			&migrator.Migration{
-				Name: "00018",
-				Func: func(tx *sql.Tx) error {
-					_, err := tx.Exec(`
-					update queue set schedule = toutc(schedule);
-					update persistent_cache set date = toutc(date);
-					update sessions set created = toutc(created), modified = toutc(modified), expires = toutc(expires);
-					`)
-					return err
-				},
-			},
-			&migrator.Migration{
-				Name: "00019",
-				Func: func(tx *sql.Tx) error {
-					_, err := tx.Exec(`
-					update posts set published = toutc(published), updated = toutc(updated);
-					insert into posts_fts(posts_fts) values ('rebuild');
-					`)
-					return err
-				},
-			},
-			&migrator.Migration{
-				Name: "00020",
-				Func: func(tx *sql.Tx) error {
-					_, err := tx.Exec(`
-					create table deleted (path text primary key);
-					create index index_post_parameters_par_val_pat on post_parameters (parameter, value, path);
-					`)
-					return err
-				},
-			},
-		),
+		migrator.Migrations(sqlMigrations...),
 	)
 	if err != nil {
 		return err
diff --git a/dbmigrations/00001.sql b/dbmigrations/00001.sql
new file mode 100644
index 0000000..bd86e65
--- /dev/null
+++ b/dbmigrations/00001.sql
@@ -0,0 +1,11 @@
+create table posts (path text not null primary key, content text, published text, updated text, blog text not null, section text);
+create table post_parameters (id integer primary key autoincrement, path text not null, parameter text not null, value text);
+create index index_pp_path on post_parameters (path);
+create trigger after delete on posts begin delete from post_parameters where path = old.path; end;
+create table indieauthauth (time text not null, code text not null, me text not null, client text not null, redirect text not null, scope text not null);
+create table indieauthtoken (time text not null, token text not null, me text not null, client text not null, scope text not null);
+create index index_iat_token on indieauthtoken (token);
+create table autocert (key text not null primary key, data blob not null, created text not null);
+create table activitypub_followers (blog text not null, follower text not null, inbox text not null, primary key (blog, follower));
+create table webmentions (id integer primary key autoincrement, source text not null, target text not null, created integer not null, status text not null default "new", title text, content text, author text, type text, unique(source, target));
+create index index_wm_target on webmentions (target);
\ No newline at end of file
diff --git a/dbmigrations/00002.sql b/dbmigrations/00002.sql
new file mode 100644
index 0000000..b4cb442
--- /dev/null
+++ b/dbmigrations/00002.sql
@@ -0,0 +1 @@
+drop table autocert;
\ No newline at end of file
diff --git a/dbmigrations/00003.sql b/dbmigrations/00003.sql
new file mode 100644
index 0000000..88a86f4
--- /dev/null
+++ b/dbmigrations/00003.sql
@@ -0,0 +1,2 @@
+drop trigger AFTER;
+create trigger trigger_posts_delete_pp after delete on posts begin delete from post_parameters where path = old.path; end;
\ No newline at end of file
diff --git a/dbmigrations/00004.sql b/dbmigrations/00004.sql
new file mode 100644
index 0000000..6801bfc
--- /dev/null
+++ b/dbmigrations/00004.sql
@@ -0,0 +1,3 @@
+create view view_posts_with_title as select id, path, title, content, published, updated, blog, section from (select p.rowid as id, p.path as path, pp.value as title, content, published, updated, blog, section from posts p left outer join post_parameters pp on p.path = pp.path where pp.parameter = 'title');
+create virtual table posts_fts using fts5(path unindexed, title, content, published unindexed, updated unindexed, blog unindexed, section unindexed, content=view_posts_with_title, content_rowid=id);
+insert into posts_fts(posts_fts) values ('rebuild');
\ No newline at end of file
diff --git a/dbmigrations/00005.sql b/dbmigrations/00005.sql
new file mode 100644
index 0000000..d442550
--- /dev/null
+++ b/dbmigrations/00005.sql
@@ -0,0 +1,3 @@
+drop view view_posts_with_title;
+create view view_posts_with_title as select id, path, title, content, published, updated, blog, section from (select p.rowid as id, p.path as path, pp.value as title, content, published, updated, blog, section from posts p left outer join (select * from post_parameters where parameter = 'title') pp on p.path = pp.path);
+insert into posts_fts(posts_fts) values ('rebuild');
\ No newline at end of file
diff --git a/dbmigrations/00006.sql b/dbmigrations/00006.sql
new file mode 100644
index 0000000..a7071ec
--- /dev/null
+++ b/dbmigrations/00006.sql
@@ -0,0 +1,8 @@
+create table indieauthauthnew (time text not null, code text not null, client text not null, redirect text not null, scope text not null);
+insert into indieauthauthnew (time, code, client, redirect, scope) select time, code, client, redirect, scope from indieauthauth;
+drop table indieauthauth;
+alter table indieauthauthnew rename to indieauthauth;
+create table indieauthtokennew (time text not null, token text not null, client text not null, scope text not null);
+insert into indieauthtokennew (time, token, client, scope) select time, token, client, scope from indieauthtoken;
+drop table indieauthtoken;
+alter table indieauthtokennew rename to indieauthtoken;
\ No newline at end of file
diff --git a/dbmigrations/00007.sql b/dbmigrations/00007.sql
new file mode 100644
index 0000000..fc6c2d4
--- /dev/null
+++ b/dbmigrations/00007.sql
@@ -0,0 +1 @@
+update posts set published = tolocal(published), updated = tolocal(updated);
\ No newline at end of file
diff --git a/dbmigrations/00008.sql b/dbmigrations/00008.sql
new file mode 100644
index 0000000..a9b92dc
--- /dev/null
+++ b/dbmigrations/00008.sql
@@ -0,0 +1 @@
+create table shortpath (id integer primary key autoincrement, path text not null, unique(path));
\ No newline at end of file
diff --git a/dbmigrations/00009.sql b/dbmigrations/00009.sql
new file mode 100644
index 0000000..2392f0d
--- /dev/null
+++ b/dbmigrations/00009.sql
@@ -0,0 +1,7 @@
+alter table posts add status text;
+update posts set status = 'published';
+drop view view_posts_with_title;
+drop table posts_fts;
+create view view_posts_with_title as select id, path, title, content, published, updated, blog, section, status from (select p.rowid as id, p.path as path, pp.value as title, content, published, updated, blog, section, status from posts p left outer join post_parameters pp on p.path = pp.path where pp.parameter = 'title');
+create virtual table posts_fts using fts5(path unindexed, title, content, published unindexed, updated unindexed, blog unindexed, section unindexed, status unindexed, content=view_posts_with_title, content_rowid=id);
+insert into posts_fts(posts_fts) values ('rebuild');
\ No newline at end of file
diff --git a/dbmigrations/00010.sql b/dbmigrations/00010.sql
new file mode 100644
index 0000000..bfa9e93
--- /dev/null
+++ b/dbmigrations/00010.sql
@@ -0,0 +1 @@
+create table comments (id integer primary key autoincrement, target text not null, name text not null, website text not null, comment text not null);
\ No newline at end of file
diff --git a/dbmigrations/00011.sql b/dbmigrations/00011.sql
new file mode 100644
index 0000000..d2ca33a
--- /dev/null
+++ b/dbmigrations/00011.sql
@@ -0,0 +1 @@
+create table notifications (id integer primary key autoincrement, time integer not null, text text not null);
\ No newline at end of file
diff --git a/dbmigrations/00012.sql b/dbmigrations/00012.sql
new file mode 100644
index 0000000..294591a
--- /dev/null
+++ b/dbmigrations/00012.sql
@@ -0,0 +1 @@
+create table persistent_cache (key text primary key, data blob, date text not null);
\ No newline at end of file
diff --git a/dbmigrations/00013.sql b/dbmigrations/00013.sql
new file mode 100644
index 0000000..e37f985
--- /dev/null
+++ b/dbmigrations/00013.sql
@@ -0,0 +1 @@
+create table sessions (id integer primary key autoincrement, data text default '', created text default '', modified datetime default '', expires text default '');
\ No newline at end of file
diff --git a/dbmigrations/00014.sql b/dbmigrations/00014.sql
new file mode 100644
index 0000000..4e4170a
--- /dev/null
+++ b/dbmigrations/00014.sql
@@ -0,0 +1 @@
+create table queue (id integer primary key autoincrement, name text not null, content blob, schedule text not null);
\ No newline at end of file
diff --git a/dbmigrations/00015.sql b/dbmigrations/00015.sql
new file mode 100644
index 0000000..3679962
--- /dev/null
+++ b/dbmigrations/00015.sql
@@ -0,0 +1,3 @@
+drop view view_posts_with_title;
+create view view_posts_with_title as select p.rowid as id, p.path as path, coalesce(pp.value, '') as title, content, published, updated, blog, section, status from posts p left outer join (select * from post_parameters pp where pp.parameter = 'title') pp on p.path = pp.path;
+insert into posts_fts(posts_fts) values ('rebuild');
\ No newline at end of file
diff --git a/dbmigrations/00016.sql b/dbmigrations/00016.sql
new file mode 100644
index 0000000..4333334
--- /dev/null
+++ b/dbmigrations/00016.sql
@@ -0,0 +1,2 @@
+create index index_queue_name on queue (name);
+create index index_queue_schedule on queue (schedule);
\ No newline at end of file
diff --git a/dbmigrations/00017.sql b/dbmigrations/00017.sql
new file mode 100644
index 0000000..103cb2f
--- /dev/null
+++ b/dbmigrations/00017.sql
@@ -0,0 +1,20 @@
+create index index_post_parameters on post_parameters (path, parameter, value);
+create index index_queue on queue (name, schedule);
+drop index index_pp_path;
+drop index index_queue_name;
+drop index index_queue_schedule;
+drop view view_posts_with_title;
+create table posts_new (path text not null primary key, content text, published text, updated text, blog text not null, section text, status text not null, priority integer not null default 0);
+insert into posts_new select *, 0 from posts;
+drop table posts;
+alter table posts_new rename to posts;
+create view view_posts_with_title as select p.rowid as id, p.path as path, coalesce(pp.value, '') as title, content, published, updated, blog, section, status, priority from posts p left outer join (select * from post_parameters pp where pp.parameter = 'title') pp on p.path = pp.path;
+drop table posts_fts;
+create virtual table posts_fts using fts5(path unindexed, title, content, published unindexed, updated unindexed, blog unindexed, section unindexed, status unindexed, priority unindexed, content=view_posts_with_title, content_rowid=id);
+insert into posts_fts(posts_fts) values ('rebuild');
+create index index_posts_status on posts (status);
+create index index_posts_blog on posts (blog);
+create index index_posts_section on posts (section);
+create index index_posts_published on posts (published);
+create index index_posts_priority on posts (published);
+drop trigger if exists trigger_posts_delete_pp;
\ No newline at end of file
diff --git a/dbmigrations/00018.sql b/dbmigrations/00018.sql
new file mode 100644
index 0000000..e9e6d37
--- /dev/null
+++ b/dbmigrations/00018.sql
@@ -0,0 +1,3 @@
+update queue set schedule = toutc(schedule);
+update persistent_cache set date = toutc(date);
+update sessions set created = toutc(created), modified = toutc(modified), expires = toutc(expires);
\ No newline at end of file
diff --git a/dbmigrations/00019.sql b/dbmigrations/00019.sql
new file mode 100644
index 0000000..1ef600f
--- /dev/null
+++ b/dbmigrations/00019.sql
@@ -0,0 +1,2 @@
+update posts set published = toutc(published), updated = toutc(updated);
+insert into posts_fts(posts_fts) values ('rebuild');
\ No newline at end of file
diff --git a/dbmigrations/00020.sql b/dbmigrations/00020.sql
new file mode 100644
index 0000000..6817b07
--- /dev/null
+++ b/dbmigrations/00020.sql
@@ -0,0 +1,2 @@
+create table deleted (path text primary key);
+create index index_post_parameters_par_val_pat on post_parameters (parameter, value, path);
\ No newline at end of file
diff --git a/dbmigrations/00021.sql b/dbmigrations/00021.sql
new file mode 100644
index 0000000..9d7d47a
--- /dev/null
+++ b/dbmigrations/00021.sql
@@ -0,0 +1 @@
+create index index_posts_sta_blo_sec on posts(status, blog, section);
\ No newline at end of file