diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 7ba781827..c2bd34155 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -11,16 +11,10 @@ jobs:
     steps:
     - name: Checkout code
       uses: actions/checkout@v1
-    - name: Install git
-      run: sudo apt-get install git -y # Used by yarn install
-    - name: Yarn install
-      uses: borales/actions-yarn@v2.0.0
-      with:
-        cmd: install
-    - name: Yarn build
-      uses: borales/actions-yarn@v2.0.0
-      with:
-        cmd: build:prod
+    - name: Install and Build
+      run: |
+          npm install
+          npm run build:prod
     - name: Deploy
       uses: maxheld83/ghpages@v0.2.1
       env:
diff --git a/src/pwa/service-worker.js b/src/pwa/service-worker.js
index ef2ab0e80..3321db0c5 100644
--- a/src/pwa/service-worker.js
+++ b/src/pwa/service-worker.js
@@ -9,9 +9,5 @@ self.addEventListener('message', (e) => {
 })
 
 /* eslint-disable no-undef */
-workbox.clientsClaim()
-
-// The precaching code provided by Workbox. You don't need to change this part.
-self.__precacheManifest = [].concat(self.__precacheManifest || [])
-workbox.precaching.suppressWarnings()
-workbox.precaching.precacheAndRoute(self.__precacheManifest, {})
+workbox.core.clientsClaim()
+workbox.precaching.precacheAndRoute(self.__precacheManifest || [])