diff --git a/config/.template.env b/config/.template.env
index 2466925..2b0b70d 100644
--- a/config/.template.env
+++ b/config/.template.env
@@ -1,6 +1,7 @@
+# Project Settings
 PROJECT_DIRECTORY=%s
 PROJECT_NAME=%s
-PHP_VERSION=%s
 
-# Ports
+# PHP
+PHP_VERSION=%s
 PHP_PORT=%s
\ No newline at end of file
diff --git a/src/Classes/File/DockerComposeFileBuilder.php b/src/Classes/File/DockerComposeFileBuilder.php
index 0eea064..31738bf 100644
--- a/src/Classes/File/DockerComposeFileBuilder.php
+++ b/src/Classes/File/DockerComposeFileBuilder.php
@@ -14,7 +14,7 @@ class DockerComposeFileBuilder extends AbstractFileBuilder
      */
     public function __construct(Config $config)
     {
-        $projectDockerCompose = $this->config->getFilePaths()->get('projectDockerCompose');
+        $projectDockerCompose = $config->getFilePaths()->get('projectDockerCompose');
 
         if (!$projectDockerCompose instanceof SpinnerFilePath) {
             throw new \Exception('Project Docker Compose file path not found.');
diff --git a/src/Command/SpinCommand.php b/src/Command/SpinCommand.php
index 7f18190..4f69cf5 100644
--- a/src/Command/SpinCommand.php
+++ b/src/Command/SpinCommand.php
@@ -131,7 +131,7 @@ class SpinCommand extends AbstractSpinnerCommand
                 file_get_contents($this->config->getFilePaths()->get('envTemplate')->getAbsolutePath()),
                 $this->config->getFilePaths()->get('project')->getAbsolutePath(),
                 $input->getArgument('name'),
-                $input->getOption('php'),
+                $this->config->getPhpVersion($input),
                 $this->getPort('php'),
             )
         );
@@ -171,8 +171,8 @@ class SpinCommand extends AbstractSpinnerCommand
         (new PHPDockerFileBuilder($this->config))->build($input)->save();
     }
 
-    private function getPort(string $service): int
+    private function getPort(string $service): ?int
     {
-        return $this->ports[$service] ?? $this->portGenerator->generateRandomPort();
+        return $this->ports[$service];
     }
 }
\ No newline at end of file