diff --git a/package.json b/package.json
index c13967d1..99c52de2 100644
--- a/package.json
+++ b/package.json
@@ -22,10 +22,10 @@
     "e2e": "run-s e2e-prep e2e-run",
     "e2e-ci": "run-s e2e-prep e2e-run-ci",
     "e2e-dev": "start-test develop 8080 e2e-exec-dev",
-    "prepublishOnly": "run-s test bootstrap build",
-    "publish": "run-s publish:version publish:push",
+    "publish": "run-s test publish:version publish:prepare publish:push",
+    "publish:prepare": "run-s bootstrap build",
     "publish:version": "lerna version --no-push",
-    "publish:push": "lerna publish from-git && git push --follow-tags",
+    "publish:push": "git push --follow-tags && lerna publish from-git",
     "publish:dry-run": "lerna version --no-git-tag-version --no-push",
     "format": "run-s \"lint:css -- --fix --quiet\" \"lint:js -- --fix --quiet\" \"format:prettier -- --write\"",
     "format:prettier": "prettier \"{{packages,scripts,website}/**/,}*.{js,css}\"",