diff --git a/README.md b/README.md
index 1a5512f..57ea87f 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 [![Total Downloads](https://img.shields.io/packagist/dt/ph3nol/docker-arch.svg)](https://packagist.org/packages/ph3nol/docker-arch)
 [![Build Status](https://secure.travis-ci.org/Ph3nol/Docker-Arch.png)](http://travis-ci.org/Ph3nol/Docker-Arch)
 
-[![SensioLabsInsight](https://insight.sensiolabs.com/projects/4f6f80c4-281a-4903-bf4c-1eb264995dbd/big.png)](https://insight.sensiolabs.com/projects/4f6f80c4-281a-4903-bf4c-1eb264995dbd)
+[![SensioLabsInsight](https://insight.sensiolabs.com/projects/acb7b2ff-0aa1-47bf-a0a9-7b944c36b7c4/big.png)](https://insight.sensiolabs.com/projects/acb7b2ff-0aa1-47bf-a0a9-7b944c36b7c4)
 
 ## Local installation
 
diff --git a/src/Application/Architect.php b/src/Application/Architect.php
index 769ee69..33b6172 100644
--- a/src/Application/Architect.php
+++ b/src/Application/Architect.php
@@ -31,11 +31,6 @@ class Architect implements ArchitectInterface
      */
     protected $templatedFileGenerator;
 
-    /**
-     * @var string
-     */
-    private $buildIdentifier;
-
     /**
      * @var string
      */
@@ -46,11 +41,6 @@ class Architect implements ArchitectInterface
      */
     private $persister;
 
-    /**
-     * @var ProjectInterface
-     */
-    private $project;
-
     /**
      * @var Filesystem
      */
@@ -66,7 +56,6 @@ public function __construct(TemplatedFileGeneratorInterface $templatedFileGenera
         define('PROJECT_SRC_DIR', PROJECT_ROOT_DIR.'/src');
 
         $this->templatedFileGenerator = $templatedFileGenerator;
-        $this->buildIdentifier = uniqid();
         $this->fs = new Filesystem();
     }
 
@@ -145,6 +134,6 @@ private function initProject($projectPath): ?ProjectInterface
             $this->persister = Persister::init($this->projectPath);
         }
 
-        return $this->project = (new ProjectRepository($this->persister))->getProject();
+        return (new ProjectRepository($this->persister))->getProject();
     }
 }
diff --git a/src/Application/DockerContainer/RedisDockerContainer.php b/src/Application/DockerContainer/RedisDockerContainer.php
index 5d5e82b..5a53eb9 100644
--- a/src/Application/DockerContainer/RedisDockerContainer.php
+++ b/src/Application/DockerContainer/RedisDockerContainer.php
@@ -17,9 +17,6 @@ class RedisDockerContainer extends DockerContainer
      */
     public function init(): void
     {
-        $this
-            ->setFrom(sprintf('redis:%s-alpine', $this->getService()->getOptions()['version']));
-
-        $service = $this->getService();
+        $this->setFrom(sprintf('redis:%s-alpine', $this->getService()->getOptions()['version']));
     }
 }
diff --git a/src/Infrastructure/Common/Persistence/DataTransformer/DockerContainerDataTransformer.php b/src/Infrastructure/Common/Persistence/DataTransformer/DockerContainerDataTransformer.php
index f9bdc08..6d948d4 100644
--- a/src/Infrastructure/Common/Persistence/DataTransformer/DockerContainerDataTransformer.php
+++ b/src/Infrastructure/Common/Persistence/DataTransformer/DockerContainerDataTransformer.php
@@ -2,6 +2,7 @@
 
 namespace Ph3\DockerArch\Infrastructure\Common\Persistence\DataTransformer;
 
+use Ph3\DockerArch\Domain\DockerContainer\Model\DockerContainer;
 use Ph3\DockerArch\Domain\DockerContainer\Model\DockerContainerInterface;
 
 /**