diff --git a/src/EventSubscriber/OrganizationalUnitSubscriber.php b/src/EventSubscriber/OrganizationalUnitSubscriber.php
index b41a44b..78b6054 100644
--- a/src/EventSubscriber/OrganizationalUnitSubscriber.php
+++ b/src/EventSubscriber/OrganizationalUnitSubscriber.php
@@ -82,6 +82,7 @@ final readonly class OrganizationalUnitSubscriber implements EventSubscriberInte
                     $client->setOgLive($networkSettings->getOgLive());
                     $client->setMenu($networkSettings->getMenu());
                     $client->setRepository($networkSettings->getRepository());
+                    $client->setTemplate($networkSettings->getPxeTemplate());
                     $this->entityManager->persist($client);
                 }
 
@@ -116,6 +117,7 @@ final readonly class OrganizationalUnitSubscriber implements EventSubscriberInte
         $newNetworkSettings->setMenu($organizationalUnitEntity->getNetworkSettings()->getMenu());
         $newNetworkSettings->setRepository($organizationalUnitEntity->getNetworkSettings()->getRepository());
         $newNetworkSettings->setOgLive($organizationalUnitEntity->getNetworkSettings()->getOgLive());
+        $newNetworkSettings->setPxeTemplate($organizationalUnitEntity->getNetworkSettings()->getPxeTemplate());
         $newNetworkSettings->setNetiface($organizationalUnitEntity->getNetworkSettings()->getNetiface());
 
         return $newNetworkSettings;
diff --git a/src/Service/CreateTraceService.php b/src/Service/CreateTraceService.php
index cb747d1..5d26221 100644
--- a/src/Service/CreateTraceService.php
+++ b/src/Service/CreateTraceService.php
@@ -21,8 +21,9 @@ readonly class CreateTraceService
             foreach ($commandTask->getClients() as $client) {
                 $trace = new Trace();
                 $trace->setClient($client);
-                $trace->setCommand($command);
+                $trace->setCommand($command->getName());
                 $trace->setStatus(TraceStatus::PENDING);
+                $trace->setInput($commandTask->getParameters());
                 $trace->setExecutedAt($commandTask->getDatetime());
                 $this->entityManager->persist($trace);
             }
@@ -33,7 +34,8 @@ readonly class CreateTraceService
                 foreach ($commandTask->getClients() as $client) {
                     $trace = new Trace();
                     $trace->setClient($client);
-                    $trace->setCommand($command);
+                    $trace->setCommand($command->getName());
+                    $trace->setInput($commandTask->getParameters());
                     $trace->setStatus(TraceStatus::PENDING);
                     $trace->setExecutedAt($commandTask->getDatetime());
                     $this->entityManager->persist($trace);