diff --git a/requirements-swh-server.txt b/requirements-swh-server.txt
--- a/requirements-swh-server.txt
+++ b/requirements-swh-server.txt
@@ -3,3 +3,4 @@
 swh.scheduler >= 0.7.0
 swh.model >= 0.3.8
 swh.auth[django] >= 0.5.3
+swh.storage >= 0.28.0
diff --git a/swh/deposit/api/common.py b/swh/deposit/api/common.py
--- a/swh/deposit/api/common.py
+++ b/swh/deposit/api/common.py
@@ -668,9 +668,7 @@
             )
 
         metadata_authority = MetadataAuthority(
-            type=MetadataAuthorityType.DEPOSIT_CLIENT,
-            url=deposit.client.provider_url,
-            metadata={"name": deposit.client.last_name},
+            type=MetadataAuthorityType.DEPOSIT_CLIENT, url=deposit.client.provider_url,
         )
 
         metadata_fetcher = self.swh_deposit_fetcher()
diff --git a/swh/deposit/config.py b/swh/deposit/config.py
--- a/swh/deposit/config.py
+++ b/swh/deposit/config.py
@@ -111,14 +111,8 @@
 
     def swh_deposit_authority(self):
         return MetadataAuthority(
-            type=MetadataAuthorityType.REGISTRY,
-            url=self.config["swh_authority_url"],
-            metadata={},
+            type=MetadataAuthorityType.REGISTRY, url=self.config["swh_authority_url"],
         )
 
     def swh_deposit_fetcher(self):
-        return MetadataFetcher(
-            name=self.tool["name"],
-            version=self.tool["version"],
-            metadata=self.tool["configuration"],
-        )
+        return MetadataFetcher(name=self.tool["name"], version=self.tool["version"],)
diff --git a/swh/deposit/tests/api/test_collection_post_atom.py b/swh/deposit/tests/api/test_collection_post_atom.py
--- a/swh/deposit/tests/api/test_collection_post_atom.py
+++ b/swh/deposit/tests/api/test_collection_post_atom.py
@@ -71,9 +71,7 @@
     swh_storage, metadata_swhid, deposit, metadata_fetcher
 ):
     swh_authority = MetadataAuthority(
-        MetadataAuthorityType.REGISTRY,
-        "http://deposit.softwareheritage.example/",
-        metadata=None,
+        MetadataAuthorityType.REGISTRY, "http://deposit.softwareheritage.example/",
     )
     page_results = swh_storage.raw_extrinsic_metadata_get(metadata_swhid, swh_authority)
 
@@ -95,7 +93,7 @@
                 target=metadata_swhid,
                 discovery_date=deposit.complete_date,
                 authority=swh_authority,
-                fetcher=attr.evolve(metadata_fetcher, metadata=None),
+                fetcher=metadata_fetcher,
                 format="xml-deposit-info",
                 metadata=expected_xml_data.encode(),
             )
@@ -570,9 +568,7 @@
 
     # Ensure metadata stored in the metadata storage is consistent
     metadata_authority = MetadataAuthority(
-        type=MetadataAuthorityType.DEPOSIT_CLIENT,
-        url=deposit_client.provider_url,
-        metadata={"name": deposit_client.last_name},
+        type=MetadataAuthorityType.DEPOSIT_CLIENT, url=deposit_client.provider_url,
     )
 
     actual_authority = swh_storage.metadata_authority_get(
@@ -582,9 +578,7 @@
 
     config = APIConfig()
     metadata_fetcher = MetadataFetcher(
-        name=config.tool["name"],
-        version=config.tool["version"],
-        metadata=config.tool["configuration"],
+        name=config.tool["name"], version=config.tool["version"],
     )
 
     actual_fetcher = swh_storage.metadata_fetcher_get(
@@ -605,8 +599,8 @@
     metadata = RawExtrinsicMetadata(
         target=swhid_target,
         discovery_date=deposit.complete_date,
-        authority=attr.evolve(metadata_authority, metadata=None),
-        fetcher=attr.evolve(metadata_fetcher, metadata=None),
+        authority=metadata_authority,
+        fetcher=metadata_fetcher,
         format="sword-v2-atom-codemeta",
         metadata=xml_data.encode(),
         **metadata_context,
@@ -652,9 +646,7 @@
 
     # Ensure metadata stored in the metadata storage is consistent
     metadata_authority = MetadataAuthority(
-        type=MetadataAuthorityType.DEPOSIT_CLIENT,
-        url=deposit_client.provider_url,
-        metadata={"name": deposit_client.last_name},
+        type=MetadataAuthorityType.DEPOSIT_CLIENT, url=deposit_client.provider_url,
     )
 
     actual_authority = swh_storage.metadata_authority_get(
@@ -664,9 +656,7 @@
 
     config = APIConfig()
     metadata_fetcher = MetadataFetcher(
-        name=config.tool["name"],
-        version=config.tool["version"],
-        metadata=config.tool["configuration"],
+        name=config.tool["name"], version=config.tool["version"],
     )
 
     actual_fetcher = swh_storage.metadata_fetcher_get(
@@ -686,8 +676,8 @@
     metadata = RawExtrinsicMetadata(
         target=origin_swhid,
         discovery_date=deposit.complete_date,
-        authority=attr.evolve(metadata_authority, metadata=None),
-        fetcher=attr.evolve(metadata_fetcher, metadata=None),
+        authority=metadata_authority,
+        fetcher=metadata_fetcher,
         format="sword-v2-atom-codemeta",
         metadata=xml_data.encode(),
     )
diff --git a/swh/deposit/tests/api/test_deposit_update_atom.py b/swh/deposit/tests/api/test_deposit_update_atom.py
--- a/swh/deposit/tests/api/test_deposit_update_atom.py
+++ b/swh/deposit/tests/api/test_deposit_update_atom.py
@@ -5,7 +5,6 @@
 
 from io import BytesIO
 
-import attr
 from django.urls import reverse_lazy as reverse
 import pytest
 from rest_framework import status
@@ -373,7 +372,6 @@
     metadata_authority = MetadataAuthority(
         type=MetadataAuthorityType.DEPOSIT_CLIENT,
         url=complete_deposit.client.provider_url,
-        metadata={"name": complete_deposit.client.last_name},
     )
 
     actual_authority = swh_storage.metadata_authority_get(
@@ -383,9 +381,7 @@
 
     config = APIConfig()
     metadata_fetcher = MetadataFetcher(
-        name=config.tool["name"],
-        version=config.tool["version"],
-        metadata=config.tool["configuration"],
+        name=config.tool["name"], version=config.tool["version"],
     )
 
     actual_fetcher = swh_storage.metadata_fetcher_get(
@@ -402,8 +398,8 @@
             RawExtrinsicMetadata(
                 target=directory_swhid,
                 discovery_date=request_meta1.date,
-                authority=attr.evolve(metadata_authority, metadata=None),
-                fetcher=attr.evolve(metadata_fetcher, metadata=None),
+                authority=metadata_authority,
+                fetcher=metadata_fetcher,
                 format="sword-v2-atom-codemeta",
                 metadata=raw_metadata1.encode(),
                 origin=complete_deposit.origin_url,