diff --git a/src/Handler.php b/src/Handler.php
index 1c34d450bc491c4e08b8ec526c66a8a562f65c26..5709ec4426304782d5ac0047c09c10d5e4e8b4a4 100644
--- a/src/Handler.php
+++ b/src/Handler.php
@@ -227,7 +227,7 @@ class Handler extends BaseHandler {
         $env->put('COMPOSE_PROJECT_NAME', $projectname);
       }
       $extra = $this->composer->getPackage()->getExtra() + ['docker4drupal' => []];
-      $options = NestedArray::mergeDeep($extra['docker4drupal'], [
+      $options = NestedArray::mergeDeep([
         'projectname' => $projectname,
         'ci_home' => '/home/gitlab-runner',
         'docker0' => [
@@ -263,7 +263,7 @@ class Handler extends BaseHandler {
           'version' => '8',
         ],
         'php' => [
-          'version' => $env->receiveGlobal('PHP_VERSION', 'PHP version', '7.2'),
+          'version' => $env->receiveGlobal('PHP_VERSION', 'PHP version', '7.3'),
           'xdebug' => $env->receiveGlobal('PHP_DEBUG', 'PHP debug', '0'),
         ],
         'webserver' => [
@@ -309,7 +309,7 @@ class Handler extends BaseHandler {
         'wkhtmltox' => [
           'enable' => 0,
         ],
-      ]);
+      ], $extra['docker4drupal']);
 
       if ($this->isCiContext() || $this->isLocalDevMode()) {
         $projectRoot = $this->getDockerMountSource(getenv('CI_PROJECT_DIR'));
@@ -329,7 +329,7 @@ class Handler extends BaseHandler {
 
       $options['projectroot'] = $projectRoot;
 
-      $this->options = $env->replaceEnvironmentVariables($options);
+    $this->options = $env->replaceEnvironmentVariables($options);
       $env->put('PHP_VERSION', $this->options['php']['version'], TRUE);
     }
     if ($key !== NULL) {