diff --git a/src/Core/ConfigMap/AbstractConfigMap.php b/src/Core/ConfigMap/AbstractConfigMap.php
index 5fa8f4d..c41793b 100644
--- a/src/Core/ConfigMap/AbstractConfigMap.php
+++ b/src/Core/ConfigMap/AbstractConfigMap.php
@@ -16,7 +16,7 @@ public function binaryData(StringMap $binaryData): void
     {
     }
 
-    public static function kind(): string
+    final public static function kind(): string
     {
         return ConfigMap::KIND;
     }
diff --git a/src/Core/Container/ContainerMaker.php b/src/Core/Container/ContainerMaker.php
index a231b7b..870ee5f 100644
--- a/src/Core/Container/ContainerMaker.php
+++ b/src/Core/Container/ContainerMaker.php
@@ -15,10 +15,10 @@
 use Dealroadshow\K8S\Framework\Core\Container\VolumeMount\VolumeMountsConfigurator;
 use Dealroadshow\K8S\Framework\Middleware\ContainerImageMiddlewareInterface;
 
-class ContainerMaker
+class ContainerMaker implements ContainerMakerInterface
 {
     /**
-     * @var ContainerImageMiddlewareInterface[]|iterable
+     * @var ContainerImageMiddlewareInterface[]
      */
     private iterable $middlewares;
 
diff --git a/src/Core/Container/ContainerMakerInterface.php b/src/Core/Container/ContainerMakerInterface.php
new file mode 100644
index 0000000..1977af5
--- /dev/null
+++ b/src/Core/Container/ContainerMakerInterface.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Dealroadshow\K8S\Framework\Core\Container;
+
+use Dealroadshow\K8S\Data\Collection\VolumeList;
+use Dealroadshow\K8S\Data\Container;
+use Dealroadshow\K8S\Framework\App\AppInterface;
+
+interface ContainerMakerInterface
+{
+    public function make(ContainerInterface $builder, VolumeList $volumes, AppInterface $app): Container;
+}
diff --git a/src/Core/CronJob/AbstractCronJob.php b/src/Core/CronJob/AbstractCronJob.php
index 85c83b3..d78d9ae 100644
--- a/src/Core/CronJob/AbstractCronJob.php
+++ b/src/Core/CronJob/AbstractCronJob.php
@@ -36,7 +36,7 @@ public function configureCronJob(CronJob  $cronJob): void
     {
     }
 
-    public static function kind(): string
+    final public static function kind(): string
     {
         return CronJob::KIND;
     }
diff --git a/src/Core/Deployment/AbstractDeployment.php b/src/Core/Deployment/AbstractDeployment.php
index a75e2b2..d57406d 100644
--- a/src/Core/Deployment/AbstractDeployment.php
+++ b/src/Core/Deployment/AbstractDeployment.php
@@ -26,11 +26,6 @@ public function imagePullSecrets(ImagePullSecretsConfigurator $secrets): void
     {
     }
 
-    public static function kind(): string
-    {
-        return Deployment::KIND;
-    }
-
     public function nodeSelector(StringMap $nodeSelector): void
     {
     }
@@ -66,4 +61,9 @@ public function progressDeadlineSeconds(): ?int
     public function configureDeployment(Deployment $deployment): void
     {
     }
+
+    final public static function kind(): string
+    {
+        return Deployment::KIND;
+    }
 }
diff --git a/src/Core/Ingress/AbstractIngress.php b/src/Core/Ingress/AbstractIngress.php
index df13022..55e3ed7 100644
--- a/src/Core/Ingress/AbstractIngress.php
+++ b/src/Core/Ingress/AbstractIngress.php
@@ -18,7 +18,7 @@ public function configureIngress(Ingress $ingress): void
     {
     }
 
-    public static function kind(): string
+    final public static function kind(): string
     {
         return Ingress::KIND;
     }
diff --git a/src/Core/Job/AbstractJob.php b/src/Core/Job/AbstractJob.php
index b22b867..297a243 100644
--- a/src/Core/Job/AbstractJob.php
+++ b/src/Core/Job/AbstractJob.php
@@ -82,7 +82,7 @@ public function configureJob(Job $job): void
     {
     }
 
-    public static function kind(): string
+    final public static function kind(): string
     {
         return Job::KIND;
     }
diff --git a/src/Core/Pod/PodSpecProcessor.php b/src/Core/Pod/PodSpecProcessor.php
index 1c6c243..495ca80 100644
--- a/src/Core/Pod/PodSpecProcessor.php
+++ b/src/Core/Pod/PodSpecProcessor.php
@@ -4,7 +4,7 @@
 
 use Dealroadshow\K8S\Data\PodSpec;
 use Dealroadshow\K8S\Framework\App\AppInterface;
-use Dealroadshow\K8S\Framework\Core\Container\ContainerMaker;
+use Dealroadshow\K8S\Framework\Core\Container\ContainerMakerInterface;
 use Dealroadshow\K8S\Framework\Core\Pod\Affinity\AffinityConfigurator;
 use Dealroadshow\K8S\Framework\Core\Pod\Containers\PodContainers;
 use Dealroadshow\K8S\Framework\Core\Pod\ImagePullSecrets\ImagePullSecretsConfigurator;
@@ -12,9 +12,9 @@
 
 class PodSpecProcessor
 {
-    private ContainerMaker $containerMaker;
+    private ContainerMakerInterface $containerMaker;
 
-    public function __construct(ContainerMaker $containerMaker)
+    public function __construct(ContainerMakerInterface $containerMaker)
     {
         $this->containerMaker = $containerMaker;
     }
diff --git a/src/Core/Secret/AbstractSecret.php b/src/Core/Secret/AbstractSecret.php
index 897d3cf..6a2b7ea 100644
--- a/src/Core/Secret/AbstractSecret.php
+++ b/src/Core/Secret/AbstractSecret.php
@@ -16,7 +16,7 @@ public function stringData(StringMap $stringData): void
     {
     }
 
-    public static function kind(): string
+    final public static function kind(): string
     {
         return Secret::KIND;
     }
diff --git a/src/Core/Service/AbstractService.php b/src/Core/Service/AbstractService.php
index a17909c..fb3aac9 100644
--- a/src/Core/Service/AbstractService.php
+++ b/src/Core/Service/AbstractService.php
@@ -26,7 +26,7 @@ public function configureService(Service $service): void
     {
     }
 
-    public static function kind(): string
+    final public static function kind(): string
     {
         return Service::KIND;
     }