diff --git a/api-server/package.json b/api-server/package.json
index 86115b8eeb..4d2fcd17bb 100644
--- a/api-server/package.json
+++ b/api-server/package.json
@@ -5,6 +5,7 @@
   "private": true,
   "main": "development-entry.js",
   "scripts": {
+    "develop": "node development-entry.js",
     "babel-dev-server": "babel-node --inspect=0.0.0.0 ./server/server.js",
     "build": "babel server --out-dir lib --ignore 'node_modules /**/*','/**/*.test.js' --copy-files",
     "commit": "git-cz",
diff --git a/client/package.json b/client/package.json
index 21a3bcba0b..e3d2d35e98 100644
--- a/client/package.json
+++ b/client/package.json
@@ -75,6 +75,7 @@
   ],
   "license": "MIT",
   "scripts": {
+    "clean": "gatsby clean",
     "prebuild": "npm run build:workers && node ../tools/scripts/ensure-env.js",
     "build": "node --max_old_space_size=7168 node_modules/gatsby-cli build",
     "build:workers": "node --max_old_space_size=7168 node_modules/webpack-cli --env.production --config ./webpack-workers.js --progress",
diff --git a/docker-compose.yml b/docker-compose.yml
index 8003aa120c..c3720bbd0f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -80,7 +80,7 @@ services:
       - seed_node_modules:/app/tools/scripts/seed/node_modules
       - client_plugin_nav_data_node_modules:/app/client/plugins/fcc-create-nav-data/node_modules
     working_dir: /app/api-server
-    command: node development-entry.js
+    command: npm run develop
     ports:
       - '3000:3000'
       - '9229:9229'
diff --git a/package.json b/package.json
index 6c9cf26851..c5d7653bd0 100644
--- a/package.json
+++ b/package.json
@@ -5,10 +5,10 @@
     "bootstrap": "lerna bootstrap --ci",
     "clean": "npm-run-all clean:client clean:all-deps",
     "clean:all-deps": "lerna clean && shx rm -rf node_modules",
-    "clean:client": "cd ./client && gatsby clean",
+    "clean:client": "cd ./client && npm run clean",
     "develop": "npm-run-all ensure-env -p develop:*",
     "develop:client": "cd ./client && npm run develop",
-    "develop:server": "cd ./api-server && node development-entry.js",
+    "develop:server": "cd ./api-server && npm run develop",
     "docker:clean": "docker-compose run -u root --rm freecodecamp bash -c \"rm -rf **/node_modules/* **/node_modules/..?* **/node_modules/.[!.]* node_modules/* node_modules/..?* node_modules/.[!.]*\"",
     "docker:develop": "docker-compose up client api-server",
     "docker:init": "docker-compose run -u root --rm freecodecamp bash change_volumes_owner.sh && docker-compose run -u root --rm client bash -c \"cd .. && bash change_volumes_owner.sh\" && docker-compose run -u root --rm api-server bash -c \"cd .. && bash change_volumes_owner.sh\"",