diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 34c8adb..eb5d60e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,30 +1,29 @@
 # This is a basic workflow to help you get started with Actions
 
-name: CD
+name: Build & Deploy
 
-# Controls when the workflow will run
 on:
   push:
     branches: ["main"]
 
 jobs:
-  build-and-deploy:
-    runs-on: ubuntu-latest
+  build:
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        node-version: [18]
     steps:
       - uses: actions/checkout@v3
-
-      - name: Set Node.js 18.x
+      - uses: pnpm/action-setup@v2
+        with:
+          version: 8
+      - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v3
         with:
-            node-version: 18.x
-
+          node-version: ${{ matrix.node-version }}
+          cache: "pnpm"
       - name: Install dependencies
-        uses: pnpm/action-setup@v2
-        with:
-          version: 8
-          run_install: true
-
-      - run: pnpm build
+        run: pnpm install
 
       - name: Deploy to Firebase
         uses: FirebaseExtended/action-hosting-deploy@v0
diff --git a/package.json b/package.json
index 84bc044..48cb6e9 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
     "author": "Mark Jarjour",
     "license": "SEE LICENSE IN LICENSE.md",
     "private": true,
+    "packageManager": "pnpm@8.7.0",
     "scripts": {
         "build": "pnpm lint --max-warnings 0 && tsc && vite build",
         "dev": "vite",
diff --git a/tsconfig.json b/tsconfig.json
index a8f7575..90114e2 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,7 +1,7 @@
 {
     "extends": "@tsconfig/vite-react/tsconfig.json",
     "compilerOptions": {
-        "baseUrl": "./src",
+        "verbatimModuleSyntax": true,
 
         "allowUnreachableCode": false,
         "exactOptionalPropertyTypes": false, // Hard to use regular React coding styles with this.
@@ -11,6 +11,6 @@
         "noPropertyAccessFromIndexSignature": true,
         "noUncheckedIndexedAccess": true,
 
-        "verbatimModuleSyntax": true
+        "baseUrl": "./src"
     }
 }