diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e766daec..140f2a75 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,10 +4,11 @@ on:
   push:
     branches:
       - main
-      - v*
+      - "v*"
   pull_request: {}
+  merge_group:
   schedule:
-    - cron: '0 3 * * *' # daily, at 3am
+    - cron: "0 3 * * *" # daily, at 3am
 
 concurrency:
   group: ci-${{ github.head_ref || github.ref }}
@@ -15,44 +16,40 @@ concurrency:
 
 jobs:
   test:
-    name: 'Tests'
+    name: "Tests"
     runs-on: ubuntu-latest
     timeout-minutes: 10
 
     steps:
-      - uses: actions/checkout@v3
-      - name: Install Node
-        uses: actions/setup-node@v3
+      - name: Checkout repository
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+      - uses: NullVoxPopuli/action-setup-pnpm@54d5e4f9b84b95458afc179edb08dc756b20f06b # v2
         with:
           node-version: 16
-          cache: yarn
-      - name: Install Dependencies
-        run: yarn install --frozen-lockfile
       - name: Lint
-        run: yarn lint
+        run: pnpm lint
       - name: Run Tests
-        run: yarn test:ember
+        run: pnpm test:ember
 
   floating:
-    name: 'Floating Dependencies'
+    name: "Floating Dependencies"
     runs-on: ubuntu-latest
     timeout-minutes: 10
 
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - name: Checkout repository
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+      - uses: NullVoxPopuli/action-setup-pnpm@54d5e4f9b84b95458afc179edb08dc756b20f06b # v2
         with:
           node-version: 16
-          cache: yarn
-      - name: Install Dependencies
-        run: yarn install --no-lockfile
+          no-lockfile: true
       - name: Run Tests
-        run: yarn test:ember
+        run: pnpm test:ember
 
   try-scenarios:
     name: ${{ matrix.try-scenario }}
     runs-on: ubuntu-latest
-    needs: 'test'
+    needs: "test"
     timeout-minutes: 10
 
     strategy:
@@ -68,13 +65,10 @@ jobs:
           - embroider-optimized
 
     steps:
-      - uses: actions/checkout@v3
-      - name: Install Node
-        uses: actions/setup-node@v3
+      - name: Checkout repository
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+      - uses: NullVoxPopuli/action-setup-pnpm@54d5e4f9b84b95458afc179edb08dc756b20f06b # v2
         with:
           node-version: 16
-          cache: yarn
-      - name: Install Dependencies
-        run: yarn install --frozen-lockfile
       - name: Run Tests
         run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index cc3922b5..1df322dd 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,25 +2,25 @@
 
 ## Installation
 
-* `git clone <repository-url>`
-* `cd ember-smile-polaris`
-* `yarn install`
+- `git clone <repository-url>`
+- `cd ember-smile-polaris`
+- `pnpm install`
 
 ## Linting
 
-* `yarn lint`
-* `yarn lint:fix`
+- `pnpm lint`
+- `pnpm lint:fix`
 
 ## Running tests
 
-* `ember test` – Runs the test suite on the current Ember version
-* `ember test --server` – Runs the test suite in "watch mode"
-* `ember try:each` – Runs the test suite against multiple Ember versions
+- `ember test` – Runs the test suite on the current Ember version
+- `ember test --server` – Runs the test suite in "watch mode"
+- `ember try:each` – Runs the test suite against multiple Ember versions
 
 ## Running the dummy application
 
-* `ember serve`
-* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
+- `ember serve`
+- Visit the dummy application at [http://localhost:4200](http://localhost:4200).
 
 For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
 
@@ -31,8 +31,8 @@ For more information on using ember-cli, visit [https://ember-cli.com/](https://
 git remote add upstream --no-tags git@github.com:smile-io/ember-polaris.git
 
 ```
-**NOTE:** Make sure you use `--no-tags` when adding upstream so that fetching from upstream does not pull in `ember-polaris`'s tags and overwrite this addon's own tags.
 
+**NOTE:** Make sure you use `--no-tags` when adding upstream so that fetching from upstream does not pull in `ember-polaris`'s tags and overwrite this addon's own tags.
 
 ### Merging upstream changes
 
@@ -43,4 +43,5 @@ git checkout master;
 git checkout -b upstream-merge;
 git merge ember-polaris-master --no-ff;
 ```
+
 On the last step among other possible conflicts, you'll notice a conflict in the `package.json` file for the package information. Ensure you keep `ember-smile-polaris'` info as is & resolve any other conflicts on a case by case basis.
diff --git a/package.json b/package.json
index fe2cb74e..9b318823 100644
--- a/package.json
+++ b/package.json
@@ -138,7 +138,7 @@
   },
   "volta": {
     "node": "16.20.2",
-    "yarn": "1.22.19"
+    "pnpm": "8.14.0"
   },
   "lintTodo": {
     "ember-template-lint": {