diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml
index d42d4a1..cfd2213 100644
--- a/.github/workflows/code-coverage.yml
+++ b/.github/workflows/code-coverage.yml
@@ -4,22 +4,28 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
+
     - name: Install Dependencies
-      run: npm install sfdx-cli
+      run: |
+        sudo npm install -g sfdx-cli
+
     - name: Populate auth file
       run: 'echo "${{ secrets.SALESFORCE_AUTH_URL }}" > ./SALESFORCE_AUTH_URL.txt'
+
     - name: Authenticate Dev Hub
-      run: 'node_modules/sfdx-cli/bin/run force:auth:sfdxurl:store -f ./SALESFORCE_AUTH_URL.txt -a devhub -d'
-    - name: Create Scratch Org
-      run: node_modules/sfdx-cli/bin/run force:org:create --targetdevhubusername devhub --setdefaultusername --definitionfile config/project-scratch-def.json --setalias ciorg --durationdays 1
+      run: 'sfdx force:auth:sfdxurl:store -f ./SALESFORCE_AUTH_URL.txt -a devhub -d'
+
+    - name: Authenticate Target Org
+      run: 'sfdx force:auth:sfdxurl:store -f ./SALESFORCE_AUTH_URL.txt -a targetOrg'
+
     - name: Deploy source
-      run: node_modules/sfdx-cli/bin/run force:source:push
+      run:  sfdx project deploy start -o targetOrg
+
     - name: Run Apex tests
-      run: node_modules/sfdx-cli/bin/run force:apex:test:run --codecoverage --resultformat human -d ./
+      run:  sfdx force:apex:test:run --codecoverage --resultformat human -d ./
+
     - name: Upload code coverage for Apex to Codecov.io
       uses: codecov/codecov-action@v2
       with:
         flags: Apex
-    - name: Delete Scratch Org
-      run: node_modules/sfdx-cli/bin/run force:org:delete --noprompt
\ No newline at end of file
diff --git a/config/project-scratch-def.json b/config/project-scratch-def.json
index 2cd039a..bb72192 100644
--- a/config/project-scratch-def.json
+++ b/config/project-scratch-def.json
@@ -2,7 +2,6 @@
   "orgName": "Demo company",
   "edition": "Developer",
   "features": ["EnableSetPasswordInApi"],
-  "lockerServiceNext" : false,
   "settings": {
     "lightningExperienceSettings": {
       "enableS1DesktopEnabled": true