diff --git a/docs/site/guides/migrations/migrate-inventory-services.md b/docs/site/guides/migrations/migrate-inventory-services.md
index 94716316c..1c0af6a6a 100644
--- a/docs/site/guides/migrations/migrate-inventory-services.md
+++ b/docs/site/guides/migrations/migrate-inventory-services.md
@@ -241,6 +241,55 @@ roles.moon.machines.eve = { };
 
 ---
 
+## Migration Status of clanModules
+
+The following table shows the migration status of each deprecated clanModule:
+
+| clanModule               | Migration Status                                                  | Notes                                                            |
+|--------------------------|-------------------------------------------------------------------|------------------------------------------------------------------|
+| `admin`                  | ✅ [Migrated](../../reference/clanServices/admin.md)              |                                                                  |
+| `auto-upgrade`           | ❌ Removed                                                        |                                                                  |
+| `borgbackup-static`      | ❌ Removed                                                        |                                                                  |
+| `borgbackup`             | ✅ [Migrated](../../reference/clanServices/borgbackup.md)         |                                                                  |
+| `data-mesher`            | ✅ [Migrated](../../reference/clanServices/data-mesher.md)        |                                                                  |
+| `deltachat`              | ❌ Removed                                                        |                                                                  |
+| `disk-id`                | ❌ Removed                                                        |                                                                  |
+| `dyndns`                 | [Being Migrated](https://git.clan.lol/clan/clan-core/pulls/4390)  |                                                                  |
+| `ergochat`               | ❌ Removed                                                        |                                                                  |
+| `garage`                 | ✅ [Migrated](../../reference/clanServices/garage.md)             |                                                                  |
+| `golem-provider`         | ❌ Removed                                                        |                                                                  |
+| `heisenbridge`           | ❌ Removed                                                        |                                                                  |
+| `importer`               | ✅ [Migrated](../../reference/clanServices/importer.md)           |                                                                  |
+| `iwd`                    | ❌ Removed                                                        | Use [wifi service](../../reference/clanServices/wifi.md) instead |
+| `localbackup`            | ❌ Removed                                                        | TODO                                                             |
+| `localsend`              | ❌ Removed                                                        |                                                                  |
+| `machine-id`             | ❌ Removed                                                        | Now an [option](../../reference/clan.core/settings.md)           |
+| `matrix-synapse`         | ❌ Removed                                                        | TODO                                                             |
+| `moonlight`              | ❌ Removed                                                        |                                                                  |
+| `mumble`                 | ❌ Removed                                                        |                                                                  |
+| `mycelium`               | ✅ [Migrated](../../reference/clanServices/mycelium.md)           |                                                                  |
+| `nginx`                  | ❌ Removed                                                        |                                                                  |
+| `packages`               | ✅ [Migrated](../../reference/clanServices/packages.md)           |                                                                  |
+| `postgresql`             | ❌ Removed                                                        | Now an [option](../../reference/clan.core/settings.md)           |
+| `root-password`          | ✅ [Migrated](../../reference/clanServices/users.md)              |                                                                  |
+| `single-disk`            | ❌ Removed                                                        |                                                                  |
+| `sshd`                   | ✅ [Migrated](../../reference/clanServices/sshd.md)               |                                                                  |
+| `state-version`          | ✅ [Migrated](../../reference/clanServices/state-version.md)      |                                                                  |
+| `static-hosts`           | ❌ Removed                                                        |                                                                  |
+| `sunshine`               | ❌ Removed                                                        |                                                                  |
+| `syncthing-static-peers` | ❌ Removed                                                        |                                                                  |
+| `syncthing`              | ❌ Removed                                                        | TODO                                                             |
+| `thelounge`              | ❌ Removed                                                        |                                                                  |
+| `trusted-nix-caches`     | ✅ [Migrated](../../reference/clanServices/trusted-nix-caches.md) |                                                                  |
+| `user-password`          | ✅ [Migrated](../../reference/clanServices/users.md)              |                                                                  |
+| `vaultwarden`            | ❌ Removed                                                        |                                                                  |
+| `xfce`                   | ❌ Removed                                                        |                                                                  |
+| `zerotier-static-peers`  | ❌ Removed                                                        |                                                                  |
+| `zerotier`               | ✅ [Migrated](../../reference/clanServices/zerotier.md)           |                                                                  |
+| `zt-tcp-relay`           | ❌ Removed                                                        |                                                                  |
+
+---
+
 !!! Warning
     * Old `clanModules` (`class = "nixos"`) are deprecated and will be removed in the near future.
     * `inventory.services` is no longer recommended; use `inventory.instances` instead.
diff --git a/nixosModules/clanCore/postgresql/tests/flake-module.nix b/nixosModules/clanCore/postgresql/tests/flake-module.nix
index 9a95c34c7..2ea5f59c9 100644
--- a/nixosModules/clanCore/postgresql/tests/flake-module.nix
+++ b/nixosModules/clanCore/postgresql/tests/flake-module.nix
@@ -21,12 +21,10 @@
               roles.default.tags.all = { };
               roles.default.extraModules = [
                 {
-
                   clan.core.postgresql.enable = true;
                   clan.core.postgresql.users.test = { };
                   clan.core.postgresql.databases.test.create.options.OWNER = "test";
                   clan.core.settings.directory = ./.;
-
                 }
               ];
             };
@@ -36,15 +34,23 @@
         # TODO: Broken. Use instead of importer after fixing.
         # nodes.machine = { };
 
-        testScript = ''
-          start_all()
-          machine.wait_for_unit("postgresql")
+        testScript =
+          let
+            runpg = "runuser -u postgres -- /run/current-system/sw/bin/psql";
+          in
+          ''
+            start_all()
+            machine.wait_for_unit("postgresql")
 
-          # Create a test table
-          machine.succeed("runuser -u postgres -- /run/current-system/sw/bin/psql -c 'CREATE TABLE test (id serial PRIMARY KEY);' test")
-          machine.succeed("runuser -u postgres -- /run/current-system/sw/bin/psql -d test -c 'INSERT INTO test DEFAULT VALUES;'")
-          machine.succeed("runuser -u postgres -- /run/current-system/sw/bin/psql -d test -c 'SELECT * FROM test;'")
-        '';
+            # Create a test table
+            machine.succeed("${runpg} -c 'CREATE TABLE test (id serial PRIMARY KEY);' test")
+
+            # Insert valuesn
+            machine.succeed("${runpg} -d test -c 'INSERT INTO test DEFAULT VALUES;'")
+
+            # Check that we can read them back
+            machine.succeed("${runpg} -d test -c 'SELECT * FROM test;'")
+          '';
       };
     };
 }