diff --git a/ghost/core/package.json b/ghost/core/package.json
index 1727b4fe8f..d7624f22cd 100644
--- a/ghost/core/package.json
+++ b/ghost/core/package.json
@@ -21,7 +21,7 @@
   "license": "MIT",
   "scripts": {
     "start": "node index",
-    "setup": "knex-migrator init && grunt symlink && yarn build || (exit 0)",
+    "setup": "knex-migrator init && grunt symlink || (exit 0)",
     "build": "yarn workspace ghost-admin run build",
     "test": "yarn test:unit",
     "test:single": "mocha --require=./test/utils/overrides.js --exit --trace-warnings --recursive --extension=test.js --timeout=60000",
diff --git a/package.json b/package.json
index f06a7420e7..ccafc0bb33 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "fix": "yarn cache clean && rm -rf node_modules && yarn",
     "knex-migrator": "yarn workspace ghost run knex-migrator",
     "lint": "yarn workspaces run lint",
-    "setup": "yarn && yarn workspace ghost run setup",
+    "setup": "yarn && yarn workspace ghost run setup && git submodule update --init",
     "start": "yarn workspace ghost run start",
     "test": "yarn workspaces run test",
     "main": "yarn main:monorepo && yarn main:submodules",