diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 8add32711..372904e99 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -17,11 +17,10 @@ jobs:
       - name: Install Node v14
         uses: actions/setup-node@v2
         with:
-          node-version: 14
+          node-version: 16
 
       - name: Install dependencies
-        # Remove --no-optional after Node 16 upgrade
-        run: npm ci --no-optional
+        run: npm ci
 
       - name: Build and deploy documentation
         uses: discordjs/action-docs@v1
diff --git a/.github/workflows/publish-dev.yml b/.github/workflows/publish-dev.yml
index d3ac053db..784c160fa 100644
--- a/.github/workflows/publish-dev.yml
+++ b/.github/workflows/publish-dev.yml
@@ -14,12 +14,11 @@ jobs:
       - name: Install Node v14
         uses: actions/setup-node@v2
         with:
-          node-version: 14
+          node-version: 16
           registry-url: https://registry.npmjs.org/
 
       - name: Install dependencies
-        # Remove --no-optional after Node 16 upgrade
-        run: npm ci --ignore-scripts --no-optional
+        run: npm ci --ignore-scripts
 
       - name: Deprecate old versions
         run: npm deprecate discord.js@"~13.0.0-dev" "no longer supported" || true
diff --git a/.github/workflows/test-cron.yml b/.github/workflows/test-cron.yml
index 5beee8f84..84c6e9406 100644
--- a/.github/workflows/test-cron.yml
+++ b/.github/workflows/test-cron.yml
@@ -13,11 +13,10 @@ jobs:
       - name: Install Node v14
         uses: actions/setup-node@v2
         with:
-          node-version: 14
+          node-version: 16
 
       - name: Install dependencies
-        # Remove --no-optional after Node 16 upgrade
-        run: npm ci --no-optional
+        run: npm ci
 
       - name: Run ESLint
         run: npm run lint
@@ -32,11 +31,10 @@ jobs:
       - name: Install Node v14
         uses: actions/setup-node@v2
         with:
-          node-version: 14
+          node-version: 16
 
       - name: Install dependencies
-        # Remove --no-optional after Node 16 upgrade
-        run: npm ci --no-optional
+        run: npm ci
 
       - name: Run TSLint
         run: npm run lint:typings
@@ -51,11 +49,10 @@ jobs:
       - name: Install Node v14
         uses: actions/setup-node@v2
         with:
-          node-version: 14
+          node-version: 16
 
       - name: Install dependencies
-        # Remove --no-optional after Node 16 upgrade
-        run: npm ci --no-optional
+        run: npm ci
 
       - name: Register Problem Matcher
         run: echo "##[add-matcher].github/tsc.json"
@@ -73,11 +70,10 @@ jobs:
       - name: Install Node v14
         uses: actions/setup-node@v2
         with:
-          node-version: 14
+          node-version: 16
 
       - name: Install dependencies
-        # Remove --no-optional after Node 16 upgrade
-        run: npm ci --no-optional
+        run: npm ci
 
       - name: Test documentation
         run: npm run docs:test
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6e58fa98c..c0312b8ee 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -11,11 +11,10 @@ jobs:
       - name: Install Node v14
         uses: actions/setup-node@v2
         with:
-          node-version: 14
+          node-version: 16
 
       - name: Install dependencies
-        # Remove --no-optional after Node 16 upgrade
-        run: npm ci --no-optional
+        run: npm ci
 
       - name: Run ESLint
         run: npm run lint
@@ -30,11 +29,10 @@ jobs:
       - name: Install Node v14
         uses: actions/setup-node@v2
         with:
-          node-version: 14
+          node-version: 16
 
       - name: Install dependencies
-        # Remove --no-optional after Node 16 upgrade
-        run: npm ci --no-optional
+        run: npm ci
 
       - name: Run TSLint
         run: npm run lint:typings
@@ -49,11 +47,10 @@ jobs:
       - name: Install Node v14
         uses: actions/setup-node@v2
         with:
-          node-version: 14
+          node-version: 16
 
       - name: Install dependencies
-        # Remove --no-optional after Node 16 upgrade
-        run: npm ci --no-optional
+        run: npm ci
 
       - name: Register Problem Matcher
         run: echo "##[add-matcher].github/tsc.json"
@@ -71,11 +68,10 @@ jobs:
       - name: Install Node v14
         uses: actions/setup-node@v2
         with:
-          node-version: 14
+          node-version: 16
 
       - name: Install dependencies
-        # Remove --no-optional after Node 16 upgrade
-        run: npm ci --no-optional
+        run: npm ci
 
       - name: Test documentation
         run: npm run docs:test