diff --git a/lib/decentralised_book_index/metadata/author.ex b/lib/decentralised_book_index/metadata/author.ex
index 1d407a2..d6bba46 100644
--- a/lib/decentralised_book_index/metadata/author.ex
+++ b/lib/decentralised_book_index/metadata/author.ex
@@ -30,7 +30,7 @@ defmodule DecentralisedBookIndex.Metadata.Author do
 
     create :create do
       primary? true
-      accept [:name, :description, :avatar_url, :author_alias_registry_id]
+      accept [:name, :description, :avatar_url, :author_alias_registry_id, :dbi_server_id]
 
       change fn changeset, context ->
         actor = Map.get(context, :actor, nil)
diff --git a/lib/decentralised_book_index/metadata/dbi_server.ex b/lib/decentralised_book_index/metadata/dbi_server.ex
index 1c5850b..dfd5090 100644
--- a/lib/decentralised_book_index/metadata/dbi_server.ex
+++ b/lib/decentralised_book_index/metadata/dbi_server.ex
@@ -26,7 +26,7 @@ defmodule DecentralisedBookIndex.Metadata.DBIServer do
 
     create :create do
       primary? true
-      accept [:name, :url, :sync_on?]
+      accept [:name, :url, :sync_on?, :dbi_server_id]
     end
 
     create :sync_create do
diff --git a/lib/decentralised_book_index/metadata/publisher.ex b/lib/decentralised_book_index/metadata/publisher.ex
index 6ab5594..61a875a 100644
--- a/lib/decentralised_book_index/metadata/publisher.ex
+++ b/lib/decentralised_book_index/metadata/publisher.ex
@@ -27,7 +27,7 @@ defmodule DecentralisedBookIndex.Metadata.Publisher do
 
     create :create do
       primary? true
-      accept [:name]
+      accept [:name, :dbi_server_id]
     end
 
     create :sync_create do
diff --git a/test/support/generators.ex b/test/support/generators.ex
index 6b0850a..e41d832 100644
--- a/test/support/generators.ex
+++ b/test/support/generators.ex
@@ -35,13 +35,16 @@ defmodule DecentralisedBookIndex.Generators do
           generate(user(role: :moderator))
         end)
 
+    dbi_server_id = opts[:dbi_server_id] || nil
+
     changeset_generator(
       Metadata.Author,
       :create,
       defaults: [
         name: sequence(:name, &"Author #{&1}"),
         description: sequence(:name, &"Description #{&1}"),
-        author_alias_registry_id: nil
+        author_alias_registry_id: nil,
+        dbi_server_id: dbi_server_id
       ],
       overrides: opts,
       actor: actor
@@ -83,16 +86,17 @@ defmodule DecentralisedBookIndex.Generators do
 
     url =
       opts[:url] ||
-        once(:default_actor, fn ->
-          "http://localhost:4002"
-        end)
+        "http://localhost:4002"
+
+    dbi_server_id = opts[:dbi_server_id] || nil
 
     changeset_generator(
       Metadata.DBIServer,
       :create,
       defaults: [
         name: sequence(:name, &"Server #{&1}"),
-        url: url
+        url: url,
+        dbi_server_id: dbi_server_id
       ],
       overrides: opts,
       actor: actor
@@ -136,11 +140,14 @@ defmodule DecentralisedBookIndex.Generators do
           generate(user(role: :moderator))
         end)
 
+    dbi_server_id = opts[:dbi_server_id] || nil
+
     changeset_generator(
       Metadata.Publisher,
       :create,
       defaults: [
-        name: sequence(:name, &"Publisher #{&1}")
+        name: sequence(:name, &"Publisher #{&1}"),
+        dbi_server_id: dbi_server_id
       ],
       overrides: opts,
       actor: actor