diff --git a/.circleci/config.yml b/.circleci/config.yml
index d9c3471..9716d0e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,7 +1,7 @@
 version: 2
 
 workdir: &workdir
-  working_directory: ~/scripts
+  working_directory: ~/repo
 
 # node8osx: &node8osx
 #   <<: *workdir
@@ -26,9 +26,9 @@ node10linux: &node10linux
 restore_modules_cache: &restore_modules_cache
   restore_cache:
     keys:
-      - scripts-{{ checksum "yarn.lock" }}
+      - repo-{{ checksum "yarn.lock" }}
       # fallback to using the latest cache if no exact match is found
-      - scripts-
+      - repo-
 
 # jobinstall: &jobinstall
 #   steps:
@@ -41,7 +41,7 @@ restore_modules_cache: &restore_modules_cache
 #         name: Installing project dependencies
 #         command: pnpm run inst
 #     - save_cache:
-#         key: scripts-{{ checksum "yarn.lock" }}
+#         key: repo-{{ checksum "yarn.lock" }}
 #         paths: node_modules
 #     - run:
 #         name: Remove node_modules to cleanup workspace
@@ -58,13 +58,13 @@ jobtest: &jobtest
         name: Checking and linting
         command: |-
            yarn add --dev eslint-config-tunnckocore@next eslint prettier &&
-           yarn start lint &&
+           yarn scripts lint &&
            yarn remove eslint-config-tunnckocore eslint prettier
     - run:
         name: Testing your project
-        command: yarn global add nyc && yarn start test
+        command: yarn global add nyc && yarn scripts test
     - save_cache:
-        key: scripts-{{ checksum "yarn.lock" }}
+        key: repo-{{ checksum "yarn.lock" }}
         paths: node_modules
     - run:
         name: Sending test coverage to CodeCov
@@ -110,10 +110,12 @@ jobs:
       - *restore_modules_cache
       - run:
           name: Bundling your awesome project
-          command: yarn start build || echo "No build step."
+          command: yarn scripts build || echo "No build step."
       - run:
           name: Releasing and publishing
-          command: yarn global add @tunnckocore/release-cli && yarn start release
+          command: |-
+            yarn global add @tunnckocore/release-cli &&
+            yarn scripts release
 
 workflows:
   version: 2
diff --git a/package.json b/package.json
index 2318d2b..fb6fe1b 100644
--- a/package.json
+++ b/package.json
@@ -4,14 +4,14 @@
   "license": "Apache-2.0",
   "licenseStart": "2018",
   "scripts": {
-    "start": "node cli.js",
-    "docs": "yarn start docks --outfile .verb.md && yarn start verb",
-    "lint": "yarn start eslint '**/*.js' --cache --fix --quiet --format codeframe",
+    "scripts": "node cli.js",
+    "docs": "yarn scripts docks --outfile .verb.md && yarn scripts verb",
+    "lint": "yarn scripts eslint '**/*.js' --cache --fix --quiet --format codeframe",
     "test-only": "node -r esm test",
-    "test": "yarn start nyc node test/index.js",
-    "precommit": "yarn start lint && yarn start test-only",
-    "commit": "yarn start dry",
-    "dry": "git add -A && git status --porcelain && yarn start gitcommit"
+    "test": "yarn scripts nyc node test/index.js",
+    "precommit": "yarn scripts lint && yarn scripts test-only",
+    "commit": "yarn scripts dry",
+    "dry": "git add -A && git status --porcelain && yarn scripts gitcommit"
   },
   "engines": {
     "node": "^8.10.0 || >=10.13.0"