diff --git a/src/PostgREST/Config.hs b/src/PostgREST/Config.hs
index 47065856a..bf48d156b 100644
--- a/src/PostgREST/Config.hs
+++ b/src/PostgREST/Config.hs
@@ -161,7 +161,7 @@ dumpOpenApiMode = \case
 -- | Dump the config
 toText :: AppConfig -> Text
 toText conf =
-  unlines $ (\(k, v) -> k <> " = " <> v) <$> pgrstSettings ++ appSettings
+  unlines $ sort $ (\(k, v) -> k <> " = " <> v) <$> pgrstSettings ++ appSettings
   where
     -- apply conf to all pgrst settings
     pgrstSettings = (\(k, v) -> (k, v conf)) <$>
diff --git a/test/io/configs/expected/aliases.config b/test/io/configs/expected/aliases.config
index d280c6254..62b361a79 100644
--- a/test/io/configs/expected/aliases.config
+++ b/test/io/configs/expected/aliases.config
@@ -1,31 +1,33 @@
+admin-server-host = "!4"
+admin-server-port = ""
 client-error-verbosity = "verbose"
 db-aggregates-enabled = false
 db-anon-role = ""
 db-channel = "pgrst"
 db-channel-enabled = true
+db-config = true
 db-extra-search-path = "public"
 db-hoisted-tx-settings = "statement_timeout,plan_filter.statement_cost_limit,default_transaction_isolation"
 db-max-rows = 1000
 db-plan-enabled = false
 db-pool = 10
 db-pool-acquisition-timeout = 10
-db-pool-max-lifetime = 1800
-db-pool-max-idletime = 5
 db-pool-automatic-recovery = true
+db-pool-max-idletime = 5
+db-pool-max-lifetime = 1800
+db-pre-config = ""
 db-pre-request = "check_alias"
 db-prepared-statements = true
 db-root-spec = "open_alias"
 db-schemas = "provided_through_alias"
-db-config = true
-db-pre-config = ""
 db-timezone-enabled = true
 db-tx-end = "commit"
 db-uri = "postgresql://"
 jwt-aud = ""
+jwt-cache-max-entries = 1000
 jwt-role-claim-key = ".\"aliased\""
 jwt-secret = ""
 jwt-secret-is-base64 = true
-jwt-cache-max-entries = 1000
 log-level = "error"
 log-query = false
 openapi-mode = "follow-privileges"
@@ -34,9 +36,7 @@ openapi-server-proxy-uri = ""
 server-cors-allowed-origins = ""
 server-host = "!4"
 server-port = 3000
-server-trace-header = ""
 server-timing-enabled = false
+server-trace-header = ""
 server-unix-socket = ""
 server-unix-socket-mode = "660"
-admin-server-host = "!4"
-admin-server-port = ""
diff --git a/test/io/configs/expected/boolean-numeric.config b/test/io/configs/expected/boolean-numeric.config
index 7f1ac07a1..9af8ff8b7 100644
--- a/test/io/configs/expected/boolean-numeric.config
+++ b/test/io/configs/expected/boolean-numeric.config
@@ -1,31 +1,33 @@
+admin-server-host = "!4"
+admin-server-port = ""
 client-error-verbosity = "verbose"
 db-aggregates-enabled = false
 db-anon-role = ""
 db-channel = "pgrst"
 db-channel-enabled = true
+db-config = true
 db-extra-search-path = "public"
 db-hoisted-tx-settings = "statement_timeout,plan_filter.statement_cost_limit,default_transaction_isolation"
 db-max-rows = ""
 db-plan-enabled = false
 db-pool = 10
 db-pool-acquisition-timeout = 10
-db-pool-max-lifetime = 1800
-db-pool-max-idletime = 30
 db-pool-automatic-recovery = true
+db-pool-max-idletime = 30
+db-pool-max-lifetime = 1800
+db-pre-config = ""
 db-pre-request = ""
 db-prepared-statements = false
 db-root-spec = ""
 db-schemas = "public"
-db-config = true
-db-pre-config = ""
 db-timezone-enabled = true
 db-tx-end = "commit"
 db-uri = "postgresql://"
 jwt-aud = ""
+jwt-cache-max-entries = 1000
 jwt-role-claim-key = ".\"role\""
 jwt-secret = ""
 jwt-secret-is-base64 = true
-jwt-cache-max-entries = 1000
 log-level = "error"
 log-query = false
 openapi-mode = "follow-privileges"
@@ -34,9 +36,7 @@ openapi-server-proxy-uri = ""
 server-cors-allowed-origins = ""
 server-host = "!4"
 server-port = 3000
-server-trace-header = ""
 server-timing-enabled = false
+server-trace-header = ""
 server-unix-socket = ""
 server-unix-socket-mode = "660"
-admin-server-host = "!4"
-admin-server-port = ""
diff --git a/test/io/configs/expected/boolean-string.config b/test/io/configs/expected/boolean-string.config
index 7f1ac07a1..9af8ff8b7 100644
--- a/test/io/configs/expected/boolean-string.config
+++ b/test/io/configs/expected/boolean-string.config
@@ -1,31 +1,33 @@
+admin-server-host = "!4"
+admin-server-port = ""
 client-error-verbosity = "verbose"
 db-aggregates-enabled = false
 db-anon-role = ""
 db-channel = "pgrst"
 db-channel-enabled = true
+db-config = true
 db-extra-search-path = "public"
 db-hoisted-tx-settings = "statement_timeout,plan_filter.statement_cost_limit,default_transaction_isolation"
 db-max-rows = ""
 db-plan-enabled = false
 db-pool = 10
 db-pool-acquisition-timeout = 10
-db-pool-max-lifetime = 1800
-db-pool-max-idletime = 30
 db-pool-automatic-recovery = true
+db-pool-max-idletime = 30
+db-pool-max-lifetime = 1800
+db-pre-config = ""
 db-pre-request = ""
 db-prepared-statements = false
 db-root-spec = ""
 db-schemas = "public"
-db-config = true
-db-pre-config = ""
 db-timezone-enabled = true
 db-tx-end = "commit"
 db-uri = "postgresql://"
 jwt-aud = ""
+jwt-cache-max-entries = 1000
 jwt-role-claim-key = ".\"role\""
 jwt-secret = ""
 jwt-secret-is-base64 = true
-jwt-cache-max-entries = 1000
 log-level = "error"
 log-query = false
 openapi-mode = "follow-privileges"
@@ -34,9 +36,7 @@ openapi-server-proxy-uri = ""
 server-cors-allowed-origins = ""
 server-host = "!4"
 server-port = 3000
-server-trace-header = ""
 server-timing-enabled = false
+server-trace-header = ""
 server-unix-socket = ""
 server-unix-socket-mode = "660"
-admin-server-host = "!4"
-admin-server-port = ""
diff --git a/test/io/configs/expected/defaults.config b/test/io/configs/expected/defaults.config
index ddd9364c2..4d1fa0302 100644
--- a/test/io/configs/expected/defaults.config
+++ b/test/io/configs/expected/defaults.config
@@ -1,31 +1,33 @@
+admin-server-host = "!4"
+admin-server-port = ""
 client-error-verbosity = "verbose"
 db-aggregates-enabled = false
 db-anon-role = ""
 db-channel = "pgrst"
 db-channel-enabled = true
+db-config = false
 db-extra-search-path = "public"
 db-hoisted-tx-settings = "statement_timeout,plan_filter.statement_cost_limit,default_transaction_isolation"
 db-max-rows = ""
 db-plan-enabled = false
 db-pool = 10
 db-pool-acquisition-timeout = 10
-db-pool-max-lifetime = 1800
-db-pool-max-idletime = 30
 db-pool-automatic-recovery = true
+db-pool-max-idletime = 30
+db-pool-max-lifetime = 1800
+db-pre-config = ""
 db-pre-request = ""
 db-prepared-statements = true
 db-root-spec = ""
 db-schemas = "public"
-db-config = false
-db-pre-config = ""
 db-timezone-enabled = true
 db-tx-end = "commit"
 db-uri = "postgresql://"
 jwt-aud = ""
+jwt-cache-max-entries = 1000
 jwt-role-claim-key = ".\"role\""
 jwt-secret = ""
 jwt-secret-is-base64 = false
-jwt-cache-max-entries = 1000
 log-level = "error"
 log-query = false
 openapi-mode = "follow-privileges"
@@ -34,9 +36,7 @@ openapi-server-proxy-uri = ""
 server-cors-allowed-origins = ""
 server-host = "!4"
 server-port = 3000
-server-trace-header = ""
 server-timing-enabled = false
+server-trace-header = ""
 server-unix-socket = ""
 server-unix-socket-mode = "660"
-admin-server-host = "!4"
-admin-server-port = ""
diff --git a/test/io/configs/expected/jspath-str-op-dump1.config b/test/io/configs/expected/jspath-str-op-dump1.config
index 25fd23346..ffb3ff5b7 100644
--- a/test/io/configs/expected/jspath-str-op-dump1.config
+++ b/test/io/configs/expected/jspath-str-op-dump1.config
@@ -1,31 +1,33 @@
+admin-server-host = "!4"
+admin-server-port = ""
 client-error-verbosity = "verbose"
 db-aggregates-enabled = false
 db-anon-role = ""
 db-channel = "pgrst"
 db-channel-enabled = true
+db-config = true
 db-extra-search-path = "public"
 db-hoisted-tx-settings = "statement_timeout,plan_filter.statement_cost_limit,default_transaction_isolation"
 db-max-rows = ""
 db-plan-enabled = false
 db-pool = 10
 db-pool-acquisition-timeout = 10
-db-pool-max-lifetime = 1800
-db-pool-max-idletime = 30
 db-pool-automatic-recovery = true
+db-pool-max-idletime = 30
+db-pool-max-lifetime = 1800
+db-pre-config = ""
 db-pre-request = ""
 db-prepared-statements = true
 db-root-spec = ""
 db-schemas = "public"
-db-config = true
-db-pre-config = ""
 db-timezone-enabled = true
 db-tx-end = "commit"
 db-uri = "postgresql://"
 jwt-aud = ""
+jwt-cache-max-entries = 1000
 jwt-role-claim-key = ".\"roles\"[?(@ == \"role1\")]"
 jwt-secret = ""
 jwt-secret-is-base64 = false
-jwt-cache-max-entries = 1000
 log-level = "error"
 log-query = false
 openapi-mode = "follow-privileges"
@@ -34,9 +36,7 @@ openapi-server-proxy-uri = ""
 server-cors-allowed-origins = ""
 server-host = "!4"
 server-port = 3000
-server-trace-header = ""
 server-timing-enabled = false
+server-trace-header = ""
 server-unix-socket = ""
 server-unix-socket-mode = "660"
-admin-server-host = "!4"
-admin-server-port = ""
diff --git a/test/io/configs/expected/jspath-str-op-dump2.config b/test/io/configs/expected/jspath-str-op-dump2.config
index b53bf827e..ce36e6d45 100644
--- a/test/io/configs/expected/jspath-str-op-dump2.config
+++ b/test/io/configs/expected/jspath-str-op-dump2.config
@@ -1,31 +1,33 @@
+admin-server-host = "!4"
+admin-server-port = ""
 client-error-verbosity = "verbose"
 db-aggregates-enabled = false
 db-anon-role = ""
 db-channel = "pgrst"
 db-channel-enabled = true
+db-config = true
 db-extra-search-path = "public"
 db-hoisted-tx-settings = "statement_timeout,plan_filter.statement_cost_limit,default_transaction_isolation"
 db-max-rows = ""
 db-plan-enabled = false
 db-pool = 10
 db-pool-acquisition-timeout = 10
-db-pool-max-lifetime = 1800
-db-pool-max-idletime = 30
 db-pool-automatic-recovery = true
+db-pool-max-idletime = 30
+db-pool-max-lifetime = 1800
+db-pre-config = ""
 db-pre-request = ""
 db-prepared-statements = true
 db-root-spec = ""
 db-schemas = "public"
-db-config = true
-db-pre-config = ""
 db-timezone-enabled = true
 db-tx-end = "commit"
 db-uri = "postgresql://"
 jwt-aud = ""
+jwt-cache-max-entries = 1000
 jwt-role-claim-key = ".\"roles\"[?(@ != \"role1\")]"
 jwt-secret = ""
 jwt-secret-is-base64 = false
-jwt-cache-max-entries = 1000
 log-level = "error"
 log-query = false
 openapi-mode = "follow-privileges"
@@ -34,9 +36,7 @@ openapi-server-proxy-uri = ""
 server-cors-allowed-origins = ""
 server-host = "!4"
 server-port = 3000
-server-trace-header = ""
 server-timing-enabled = false
+server-trace-header = ""
 server-unix-socket = ""
 server-unix-socket-mode = "660"
-admin-server-host = "!4"
-admin-server-port = ""
diff --git a/test/io/configs/expected/jspath-str-op-dump3.config b/test/io/configs/expected/jspath-str-op-dump3.config
index bd1bed993..7762993f3 100644
--- a/test/io/configs/expected/jspath-str-op-dump3.config
+++ b/test/io/configs/expected/jspath-str-op-dump3.config
@@ -1,31 +1,33 @@
+admin-server-host = "!4"
+admin-server-port = ""
 client-error-verbosity = "verbose"
 db-aggregates-enabled = false
 db-anon-role = ""
 db-channel = "pgrst"
 db-channel-enabled = true
+db-config = true
 db-extra-search-path = "public"
 db-hoisted-tx-settings = "statement_timeout,plan_filter.statement_cost_limit,default_transaction_isolation"
 db-max-rows = ""
 db-plan-enabled = false
 db-pool = 10
 db-pool-acquisition-timeout = 10
-db-pool-max-lifetime = 1800
-db-pool-max-idletime = 30
 db-pool-automatic-recovery = true
+db-pool-max-idletime = 30
+db-pool-max-lifetime = 1800
+db-pre-config = ""
 db-pre-request = ""
 db-prepared-statements = true
 db-root-spec = ""
 db-schemas = "public"
-db-config = true
-db-pre-config = ""
 db-timezone-enabled = true
 db-tx-end = "commit"
 db-uri = "postgresql://"
 jwt-aud = ""
+jwt-cache-max-entries = 1000
 jwt-role-claim-key = ".\"roles\"[?(@ ^== \"role1\")]"
 jwt-secret = ""
 jwt-secret-is-base64 = false
-jwt-cache-max-entries = 1000
 log-level = "error"
 log-query = false
 openapi-mode = "follow-privileges"
@@ -34,9 +36,7 @@ openapi-server-proxy-uri = ""
 server-cors-allowed-origins = ""
 server-host = "!4"
 server-port = 3000
-server-trace-header = ""
 server-timing-enabled = false
+server-trace-header = ""
 server-unix-socket = ""
 server-unix-socket-mode = "660"
-admin-server-host = "!4"
-admin-server-port = ""
diff --git a/test/io/configs/expected/jspath-str-op-dump4.config b/test/io/configs/expected/jspath-str-op-dump4.config
index b169f03a2..f98c84ffe 100644
--- a/test/io/configs/expected/jspath-str-op-dump4.config
+++ b/test/io/configs/expected/jspath-str-op-dump4.config
@@ -1,31 +1,33 @@
+admin-server-host = "!4"
+admin-server-port = ""
 client-error-verbosity = "verbose"
 db-aggregates-enabled = false
 db-anon-role = ""
 db-channel = "pgrst"
 db-channel-enabled = true
+db-config = true
 db-extra-search-path = "public"
 db-hoisted-tx-settings = "statement_timeout,plan_filter.statement_cost_limit,default_transaction_isolation"
 db-max-rows = ""
 db-plan-enabled = false
 db-pool = 10
 db-pool-acquisition-timeout = 10
-db-pool-max-lifetime = 1800
-db-pool-max-idletime = 30
 db-pool-automatic-recovery = true
+db-pool-max-idletime = 30
+db-pool-max-lifetime = 1800
+db-pre-config = ""
 db-pre-request = ""
 db-prepared-statements = true
 db-root-spec = ""
 db-schemas = "public"
-db-config = true
-db-pre-config = ""
 db-timezone-enabled = true
 db-tx-end = "commit"
 db-uri = "postgresql://"
 jwt-aud = ""
+jwt-cache-max-entries = 1000
 jwt-role-claim-key = ".\"roles\"[?(@ ==^ \"role1\")]"
 jwt-secret = ""
 jwt-secret-is-base64 = false
-jwt-cache-max-entries = 1000
 log-level = "error"
 log-query = false
 openapi-mode = "follow-privileges"
@@ -34,9 +36,7 @@ openapi-server-proxy-uri = ""
 server-cors-allowed-origins = ""
 server-host = "!4"
 server-port = 3000
-server-trace-header = ""
 server-timing-enabled = false
+server-trace-header = ""
 server-unix-socket = ""
 server-unix-socket-mode = "660"
-admin-server-host = "!4"
-admin-server-port = ""
diff --git a/test/io/configs/expected/jspath-str-op-dump5.config b/test/io/configs/expected/jspath-str-op-dump5.config
index 13596cc81..9e59c9631 100644
--- a/test/io/configs/expected/jspath-str-op-dump5.config
+++ b/test/io/configs/expected/jspath-str-op-dump5.config
@@ -1,31 +1,33 @@
+admin-server-host = "!4"
+admin-server-port = ""
 client-error-verbosity = "verbose"
 db-aggregates-enabled = false
 db-anon-role = ""
 db-channel = "pgrst"
 db-channel-enabled = true
+db-config = true
 db-extra-search-path = "public"
 db-hoisted-tx-settings = "statement_timeout,plan_filter.statement_cost_limit,default_transaction_isolation"
 db-max-rows = ""
 db-plan-enabled = false
 db-pool = 10
 db-pool-acquisition-timeout = 10
-db-pool-max-lifetime = 1800
-db-pool-max-idletime = 30
 db-pool-automatic-recovery = true
+db-pool-max-idletime = 30
+db-pool-max-lifetime = 1800
+db-pre-config = ""
 db-pre-request = ""
 db-prepared-statements = true
 db-root-spec = ""
 db-schemas = "public"
-db-config = true
-db-pre-config = ""
 db-timezone-enabled = true
 db-tx-end = "commit"
 db-uri = "postgresql://"
 jwt-aud = ""
+jwt-cache-max-entries = 1000
 jwt-role-claim-key = ".\"roles\"[?(@ *== \"role1\")]"
 jwt-secret = ""
 jwt-secret-is-base64 = false
-jwt-cache-max-entries = 1000
 log-level = "error"
 log-query = false
 openapi-mode = "follow-privileges"
@@ -34,9 +36,7 @@ openapi-server-proxy-uri = ""
 server-cors-allowed-origins = ""
 server-host = "!4"
 server-port = 3000
-server-trace-header = ""
 server-timing-enabled = false
+server-trace-header = ""
 server-unix-socket = ""
 server-unix-socket-mode = "660"
-admin-server-host = "!4"
-admin-server-port = ""
diff --git a/test/io/configs/expected/no-defaults-with-db-other-authenticator.config b/test/io/configs/expected/no-defaults-with-db-other-authenticator.config
index c47bb402e..150924128 100644
--- a/test/io/configs/expected/no-defaults-with-db-other-authenticator.config
+++ b/test/io/configs/expected/no-defaults-with-db-other-authenticator.config
@@ -1,31 +1,35 @@
+admin-server-host = "127.0.0.1"
+admin-server-port = 3001
+app.settings.test = "test"
+app.settings.test2 = "test"
 client-error-verbosity = "minimal"
 db-aggregates-enabled = false
 db-anon-role = "pre_config_role"
 db-channel = "postgrest"
 db-channel-enabled = false
+db-config = true
 db-extra-search-path = "public,extensions,other"
 db-hoisted-tx-settings = "maintenance_work_mem"
 db-max-rows = 100
 db-plan-enabled = true
 db-pool = 1
 db-pool-acquisition-timeout = 30
-db-pool-max-lifetime = 3600
-db-pool-max-idletime = 60
 db-pool-automatic-recovery = false
+db-pool-max-idletime = 60
+db-pool-max-lifetime = 3600
+db-pre-config = "postgrest.other_preconf"
 db-pre-request = "test.other_custom_headers"
 db-prepared-statements = false
 db-root-spec = "other_root"
 db-schemas = "test,other_tenant1,other_tenant2"
-db-config = true
-db-pre-config = "postgrest.other_preconf"
 db-timezone-enabled = false
 db-tx-end = "rollback-allow-override"
 db-uri = "postgresql://"
 jwt-aud = "https://otherexample.org"
+jwt-cache-max-entries = 86400
 jwt-role-claim-key = ".\"other\".\"pre_config_role\""
 jwt-secret = "ODERREALLYREALLYREALLYREALLYVERYSAFE"
 jwt-secret-is-base64 = false
-jwt-cache-max-entries = 86400
 log-level = "info"
 log-query = true
 openapi-mode = "disabled"
@@ -34,11 +38,7 @@ openapi-server-proxy-uri = "https://otherexample.org/api"
 server-cors-allowed-origins = "http://otherorigin.com"
 server-host = "0.0.0.0"
 server-port = 80
-server-trace-header = "traceparent"
 server-timing-enabled = true
+server-trace-header = "traceparent"
 server-unix-socket = "/tmp/pgrst_io_test.sock"
 server-unix-socket-mode = "777"
-admin-server-host = "127.0.0.1"
-admin-server-port = 3001
-app.settings.test = "test"
-app.settings.test2 = "test"
diff --git a/test/io/configs/expected/no-defaults-with-db.config b/test/io/configs/expected/no-defaults-with-db.config
index 4363f3262..05eb4e0fa 100644
--- a/test/io/configs/expected/no-defaults-with-db.config
+++ b/test/io/configs/expected/no-defaults-with-db.config
@@ -1,31 +1,35 @@
+admin-server-host = "127.0.0.1"
+admin-server-port = 3001
+app.settings.test = "test"
+app.settings.test2 = "test"
 client-error-verbosity = "minimal"
 db-aggregates-enabled = false
 db-anon-role = "anonymous"
 db-channel = "postgrest"
 db-channel-enabled = false
+db-config = true
 db-extra-search-path = "public,extensions,private"
 db-hoisted-tx-settings = "autovacuum_work_mem"
 db-max-rows = 500
 db-plan-enabled = false
 db-pool = 1
 db-pool-acquisition-timeout = 30
-db-pool-max-lifetime = 3600
-db-pool-max-idletime = 60
 db-pool-automatic-recovery = false
+db-pool-max-idletime = 60
+db-pool-max-lifetime = 3600
+db-pre-config = "postgrest.preconf"
 db-pre-request = "test.custom_headers"
 db-prepared-statements = false
 db-root-spec = "root"
 db-schemas = "test,tenant1,tenant2"
-db-config = true
-db-pre-config = "postgrest.preconf"
 db-timezone-enabled = false
 db-tx-end = "commit-allow-override"
 db-uri = "postgresql://"
 jwt-aud = "https://example.org"
+jwt-cache-max-entries = 86400
 jwt-role-claim-key = ".\"a\".\"role\""
 jwt-secret = "OVERRIDE=REALLY=REALLY=REALLY=REALLY=VERY=SAFE"
 jwt-secret-is-base64 = false
-jwt-cache-max-entries = 86400
 log-level = "info"
 log-query = true
 openapi-mode = "ignore-privileges"
@@ -34,11 +38,7 @@ openapi-server-proxy-uri = "https://example.org/api"
 server-cors-allowed-origins = "http://origin.com"
 server-host = "0.0.0.0"
 server-port = 80
-server-trace-header = "CF-Ray"
 server-timing-enabled = false
+server-trace-header = "CF-Ray"
 server-unix-socket = "/tmp/pgrst_io_test.sock"
 server-unix-socket-mode = "777"
-admin-server-host = "127.0.0.1"
-admin-server-port = 3001
-app.settings.test = "test"
-app.settings.test2 = "test"
diff --git a/test/io/configs/expected/no-defaults.config b/test/io/configs/expected/no-defaults.config
index 315628773..887c5fce3 100644
--- a/test/io/configs/expected/no-defaults.config
+++ b/test/io/configs/expected/no-defaults.config
@@ -1,31 +1,35 @@
+admin-server-host = "127.0.0.1"
+admin-server-port = 3001
+app.settings.test = "test"
+app.settings.test2 = "test"
 client-error-verbosity = "minimal"
 db-aggregates-enabled = true
 db-anon-role = "root"
 db-channel = "postgrest"
 db-channel-enabled = false
+db-config = false
 db-extra-search-path = "public,test"
 db-hoisted-tx-settings = "work_mem"
 db-max-rows = 1000
 db-plan-enabled = true
 db-pool = 1
 db-pool-acquisition-timeout = 30
-db-pool-max-lifetime = 3600
-db-pool-max-idletime = 60
 db-pool-automatic-recovery = false
+db-pool-max-idletime = 60
+db-pool-max-lifetime = 3600
+db-pre-config = "postgrest.pre_config"
 db-pre-request = "please_run_fast"
 db-prepared-statements = false
 db-root-spec = "openapi_v3"
 db-schemas = "multi,tenant,setup"
-db-config = false
-db-pre-config = "postgrest.pre_config"
 db-timezone-enabled = false
 db-tx-end = "rollback-allow-override"
 db-uri = "tmp_db"
 jwt-aud = "https://postgrest.org"
+jwt-cache-max-entries = 86400
 jwt-role-claim-key = ".\"user\"[0].\"real-role\""
 jwt-secret = "c2VjdXJpdHl0aHJvdWdob2JzY3VyaXR5aW5iYXNlNjQ="
 jwt-secret-is-base64 = true
-jwt-cache-max-entries = 86400
 log-level = "info"
 log-query = true
 openapi-mode = "ignore-privileges"
@@ -34,11 +38,7 @@ openapi-server-proxy-uri = "https://postgrest.org"
 server-cors-allowed-origins = "http://example.com"
 server-host = "0.0.0.0"
 server-port = 80
-server-trace-header = "X-Request-Id"
 server-timing-enabled = true
+server-trace-header = "X-Request-Id"
 server-unix-socket = "/tmp/pgrst_io_test.sock"
 server-unix-socket-mode = "777"
-admin-server-host = "127.0.0.1"
-admin-server-port = 3001
-app.settings.test = "test"
-app.settings.test2 = "test"
diff --git a/test/io/configs/expected/types.config b/test/io/configs/expected/types.config
index fac4d596d..ecabdea00 100644
--- a/test/io/configs/expected/types.config
+++ b/test/io/configs/expected/types.config
@@ -1,31 +1,34 @@
+admin-server-host = "!4"
+admin-server-port = ""
+app.settings.test = "Bool False"
 client-error-verbosity = "verbose"
 db-aggregates-enabled = false
 db-anon-role = ""
 db-channel = "pgrst"
 db-channel-enabled = true
+db-config = true
 db-extra-search-path = "public"
 db-hoisted-tx-settings = "statement_timeout,plan_filter.statement_cost_limit,default_transaction_isolation"
 db-max-rows = ""
 db-plan-enabled = false
 db-pool = 10
 db-pool-acquisition-timeout = 10
-db-pool-max-lifetime = 1800
-db-pool-max-idletime = 30
 db-pool-automatic-recovery = true
+db-pool-max-idletime = 30
+db-pool-max-lifetime = 1800
+db-pre-config = ""
 db-pre-request = ""
 db-prepared-statements = true
 db-root-spec = ""
 db-schemas = "public"
-db-config = true
-db-pre-config = ""
 db-timezone-enabled = true
 db-tx-end = "commit"
 db-uri = "postgresql://"
 jwt-aud = ""
+jwt-cache-max-entries = 1000
 jwt-role-claim-key = ".\"role\""
 jwt-secret = ""
 jwt-secret-is-base64 = false
-jwt-cache-max-entries = 1000
 log-level = "error"
 log-query = false
 openapi-mode = "follow-privileges"
@@ -34,10 +37,7 @@ openapi-server-proxy-uri = ""
 server-cors-allowed-origins = ""
 server-host = "!4"
 server-port = 3000
-server-trace-header = ""
 server-timing-enabled = false
+server-trace-header = ""
 server-unix-socket = ""
 server-unix-socket-mode = "660"
-admin-server-host = "!4"
-admin-server-port = ""
-app.settings.test = "Bool False"
diff --git a/test/io/configs/expected/utf-8.config b/test/io/configs/expected/utf-8.config
index 7f29a498c..06e428a39 100644
--- a/test/io/configs/expected/utf-8.config
+++ b/test/io/configs/expected/utf-8.config
@@ -1,31 +1,33 @@
+admin-server-host = "!4"
+admin-server-port = ""
 client-error-verbosity = "verbose"
 db-aggregates-enabled = false
 db-anon-role = ""
 db-channel = "pgrst"
 db-channel-enabled = true
+db-config = true
 db-extra-search-path = "public"
 db-hoisted-tx-settings = "statement_timeout,plan_filter.statement_cost_limit,default_transaction_isolation"
 db-max-rows = ""
 db-plan-enabled = false
 db-pool = 10
 db-pool-acquisition-timeout = 10
-db-pool-max-lifetime = 1800
-db-pool-max-idletime = 30
 db-pool-automatic-recovery = true
+db-pool-max-idletime = 30
+db-pool-max-lifetime = 1800
+db-pre-config = ""
 db-pre-request = ""
 db-prepared-statements = true
 db-root-spec = ""
 db-schemas = "public"
-db-config = true
-db-pre-config = ""
 db-timezone-enabled = true
 db-tx-end = "commit"
 db-uri = "postgresql://"
 jwt-aud = ""
+jwt-cache-max-entries = 1000
 jwt-role-claim-key = ".\"role\""
 jwt-secret = ""
 jwt-secret-is-base64 = false
-jwt-cache-max-entries = 1000
 log-level = "crit"
 log-query = false
 openapi-mode = "follow-privileges"
@@ -34,9 +36,7 @@ openapi-server-proxy-uri = ""
 server-cors-allowed-origins = ""
 server-host = "!4"
 server-port = 3000
-server-trace-header = ""
 server-timing-enabled = false
+server-trace-header = ""
 server-unix-socket = ""
 server-unix-socket-mode = "660"
-admin-server-host = "!4"
-admin-server-port = ""