diff --git a/src/main/resources/interface-specification.yml b/src/main/resources/interface-specification.yml
index e15a9bb..a4cf49b 100644
--- a/src/main/resources/interface-specification.yml
+++ b/src/main/resources/interface-specification.yml
@@ -1094,7 +1094,6 @@ components:
         - selfcareId
         - name
         - onboardedAt
-        - subUnitType
     TenantUnitType:
       type: string
       enum:
diff --git a/src/main/scala/it/pagopa/interop/tenantprocess/api/adapters/AdaptableSeed.scala b/src/main/scala/it/pagopa/interop/tenantprocess/api/adapters/AdaptableSeed.scala
index f65d718..8c21b7f 100644
--- a/src/main/scala/it/pagopa/interop/tenantprocess/api/adapters/AdaptableSeed.scala
+++ b/src/main/scala/it/pagopa/interop/tenantprocess/api/adapters/AdaptableSeed.scala
@@ -60,7 +60,7 @@ object AdaptableSeed {
         name = a.name,
         kind = kind,
         onboardedAt = Some(a.onboardedAt),
-        subUnitType = Some(a.subUnitType.toDependency)
+        subUnitType = a.subUnitType.map(_.toDependency)
       )
   }
 }
diff --git a/src/main/scala/it/pagopa/interop/tenantprocess/api/impl/package.scala b/src/main/scala/it/pagopa/interop/tenantprocess/api/impl/package.scala
index 32d926f..f7548ee 100644
--- a/src/main/scala/it/pagopa/interop/tenantprocess/api/impl/package.scala
+++ b/src/main/scala/it/pagopa/interop/tenantprocess/api/impl/package.scala
@@ -16,8 +16,8 @@ package object impl extends SprayJsonSupport with DefaultJsonProtocol {
   implicit def internalAttributeSeedFormat: RootJsonFormat[InternalAttributeSeed] = jsonFormat2(InternalAttributeSeed)
   implicit def internalTenantSeedFormat: RootJsonFormat[InternalTenantSeed]       = jsonFormat3(InternalTenantSeed)
 
-  implicit def m2mAttributeSeedFormat: RootJsonFormat[M2MAttributeSeed] = jsonFormat1(M2MAttributeSeed)
-  implicit def m2mTenantSeedFormat: RootJsonFormat[M2MTenantSeed]       = jsonFormat3(M2MTenantSeed)
+  implicit def m2mAttributeSeedFormat: RootJsonFormat[M2MAttributeSeed]     = jsonFormat1(M2MAttributeSeed)
+  implicit def m2mTenantSeedFormat: RootJsonFormat[M2MTenantSeed]           = jsonFormat3(M2MTenantSeed)
   implicit def selfcareTenantSeedFormat: RootJsonFormat[SelfcareTenantSeed] = jsonFormat6(SelfcareTenantSeed)
 
   implicit def certifierFormat: RootJsonFormat[Certifier]             = jsonFormat1(Certifier)
diff --git a/src/test/scala/it/pagopa/interop/tenantprocess/utils/SpecData.scala b/src/test/scala/it/pagopa/interop/tenantprocess/utils/SpecData.scala
index 5fbd099..0180c5a 100644
--- a/src/test/scala/it/pagopa/interop/tenantprocess/utils/SpecData.scala
+++ b/src/test/scala/it/pagopa/interop/tenantprocess/utils/SpecData.scala
@@ -64,7 +64,7 @@ trait SpecData {
       "test_name",
       None,
       timestamp,
-      TenantUnitType.AOO
+      Some(TenantUnitType.AOO)
     )
   val selfcareTenantSeedNotIpa: SelfcareTenantSeed =
     SelfcareTenantSeed(
@@ -73,7 +73,7 @@ trait SpecData {
       "test_name",
       None,
       timestamp,
-      TenantUnitType.AOO
+      Some(TenantUnitType.AOO)
     )
 
   val dependencyTenant: Dependency.Tenant = Dependency.Tenant(