diff --git a/src/Plugin.php b/src/Plugin.php
index d21af405f9a66d9a7a49be6655906571986303e7..5c770094ba02c70a53740e544790951056ec99e4 100644
--- a/src/Plugin.php
+++ b/src/Plugin.php
@@ -50,13 +50,29 @@ class Plugin extends BasePlugin {
    */
   public static function getSubscribedEvents(): array {
     return [
-      ScriptEvents::POST_CREATE_PROJECT_CMD => 'prepareProject',
+      ScriptEvents::POST_CREATE_PROJECT_CMD => 'createProject',
       ScriptEvents::POST_UPDATE_CMD => 'prepareProject',
     ];
   }
 
   /**
-   * Post create and update project event callback.
+   * Post create project event callback.
+   *
+   * @param \Composer\Script\Event $event
+   *   The event that triggered the plugin.
+   *
+   * @throws \Twig_Error_Loader
+   * @throws \Twig_Error_Runtime
+   * @throws \Twig_Error_Syntax
+   */
+  public function createProject(Event $event) {
+    $this->scaffoldHandler->downloadScaffold();
+    $this->scaffoldHandler->generateAutoload();
+    $this->prepareProject($event);
+  }
+
+  /**
+   * Post update project event callback.
    *
    * @param \Composer\Script\Event $event
    *   The event that triggered the plugin.