diff --git a/composer.json b/composer.json
index 6c4b0f1c..3a8db851 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,9 @@
 {
     "scripts": {
-        "dev": "sculpin generate --server --watch --clean --no-interaction",
-        "prod": "sculpin generate --env prod --clean --no-interaction"
+        "dev": "composer run-script generate",
+        "generate": "sculpin generate --clean --no-interaction",
+        "prod": "composer run-script generate -- --env prod",
+        "watch": "composer run-script --timeout=0 generate -- --server --watch"
     },
     "require": {
         "php": "^5.5|^7.0",