diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 681258d60..2cb78141d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,4 +26,4 @@ jobs:
       - name: Run build
         run: npm run build
       - name: Validate Internal Links
-        run: npm run validate:links
+        run: npm run lint:links
diff --git a/package.json b/package.json
index e2ee1e143..25c74a784 100644
--- a/package.json
+++ b/package.json
@@ -14,30 +14,30 @@
     },
     "license": "Apache-2.0",
     "scripts": {
-        "images": "imagemin '_site/assets/images' --out-dir='_site/assets/images'",
-        "install:playground": "cd src/playground && npm install --no-package-lock",
-        "watch:sass": "sass --watch src/assets/scss:src/assets/css",
-        "watch:eleventy": "cross-env IS_DEV=true eleventy --serve --port=2022",
-        "watch:webpack": "webpack watch --mode=development",
+        "build": "npm-run-all install:playground build:sass build:website build:playground build:minify-images",
+        "build:minify-images": "imagemin '_site/assets/images' --out-dir='_site/assets/images'",
+        "build:minify-svg": "svgo -r -f ./",
+        "build:playground": "webpack --mode=production --progress",
+        "build:playground:watch": "webpack watch --mode=development",
         "build:sass": "sass --no-source-map --style=compressed src/assets/scss:src/assets/css",
-        "build:eleventy": "npx @11ty/eleventy",
-        "build:webpack": "webpack --mode=production --progress",
-        "fetch:team": "node tools/fetch-team-data.js",
+        "build:sass:watch": "sass --watch src/assets/scss:src/assets/css",
+        "build:website": "npx @11ty/eleventy",
+        "build:website:watch": "cross-env IS_DEV=true eleventy --serve --port=2022",
+        "fetch": "npm-run-all --parallel fetch:*",
         "fetch:stats": "node tools/fetch-stats.js",
         "fetch:sponsors": "node tools/fetch-sponsors.js",
-        "fetch": "npm-run-all --parallel fetch:*",
-        "start": "npm-run-all build:sass --parallel watch:*",
-        "build": "npm-run-all install:playground build:sass build:eleventy build:webpack images",
-        "minify:svg": "svgo -r -f ./",
-        "validate:links": "cross-env NODE_OPTIONS=--max-old-space-size=4096 node tools/validate-links.js",
+        "fetch:team": "node tools/fetch-team-data.js",
+        "install:playground": "cd src/playground && npm install --no-package-lock",
+        "lint": "npm-run-all --parallel lint:js lint:md lint:scss",
+        "lint:fix": "npm-run-all --parallel lint:fix:*",
         "lint:js": "eslint --ext=.js,.jsx .",
+        "lint:fix:js": "eslint --ext=.js,.jsx . --fix",
+        "lint:links": "cross-env NODE_OPTIONS=--max-old-space-size=4096 node tools/validate-links.js",
         "lint:md": "markdownlint \"**/*.md\" ",
+        "lint:fix:md": "markdownlint --fix  \"**/*.md\"",
         "lint:scss": "stylelint \"**/*.scss\"",
-        "lint": "npm-run-all --parallel lint:*",
-        "lint:fix:js": "eslint --ext=.js,.jsx . --fix",
         "lint:fix:scss": "stylelint \"**/*.scss\" --fix",
-        "lint:fix:md": "markdownlint --fix  \"**/*.md\"",
-        "fix": "npm-run-all --parallel lint:fix:*"
+        "start": "npm-run-all build:sass --parallel *:*:watch"
     },
     "lint-staged": {
         "**/*.{js,jsx}": "eslint --fix",