diff --git a/.github/workflows/deploy.and.test.yml b/.github/workflows/deploy.and.test.yml
index 54636a55..fa946445 100644
--- a/.github/workflows/deploy.and.test.yml
+++ b/.github/workflows/deploy.and.test.yml
@@ -15,14 +15,14 @@ jobs:
         with:
           ref: ${{github.event.pull_request.head.ref}}
           repository: ${{github.event.pull_request.head.repo.full_name}}
-      - name: Install SFDX CLI and authorize DevHub
-        uses: apex-enterprise-patterns/setup-sfdx@v1 #We're using a fork of https://github.com/sfdx-actions/setup-sfdx for safety
+      - name: Install SF CLI and authorize DevHub
+        uses: apex-enterprise-patterns/setup-sfdx@v2 #We're using a fork of https://github.com/sfdx-actions/setup-sfdx for safety
         with:
           sfdx-auth-url: ${{ secrets.DEVHUB_SFDXURL }}
-      - run: sfdx force:config:set defaultdevhubusername=SFDX-ENV -g #Even though the setup-sfdx action uses --setdefaultdevhubusername, it doesn't seem to stick since it uses --setdefaultusername so we brute force it here
-      - run: sfdx force:org:create -f config/project-scratch-def.json --setdefaultusername -d 1
-      - run: sfdx force:source:push
-      - run: sfdx force:apex:test:run -w 5
+      - run: sf config set target-dev-hub SFDX-ENV --global #Even though the setup-sfdx action uses --setdefaultdevhubusername, it doesn't seem to stick since it uses --setdefaultusername so we brute force it here
+      - run: sf org create scratch --definition-file config/project-scratch-def.json --set-default --duration-days 1 --no-track-source
+      - run: sf project deploy start
+      - run: sf apex run test --wait 5
       - name: Destroy scratch org
-        run: sfdx force:org:delete -p
+        run: sf org delete scratch --no-prompt
         if: always()