diff --git a/firebase.json b/firebase.json
index c4d43f4..657bfdc 100644
--- a/firebase.json
+++ b/firebase.json
@@ -11,6 +11,26 @@
         "source": "**",
         "destination": "/index.html"
       }
+    ],
+    "headers": [
+      {
+        "source": "**/*.{jpg,jpeg,gif,png,js,css}",
+        "headers": [
+          {
+            "key": "Cache-Control",
+            "value": "public, max-age=2592000"
+          }
+        ]
+      },
+      {
+        "source": "index.html",
+        "headers": [
+          {
+            "key": "Cache-Control",
+            "value": "public, max-age=2592000"
+          }
+        ]
+      }
     ]
   },
   "firestore": {
diff --git a/public/index.html b/public/index.html
index c7eb795..8882ea3 100644
--- a/public/index.html
+++ b/public/index.html
@@ -49,14 +49,14 @@
     <div id="main" role="main">
     </div>
     <script async defer type="module" src="/main.js"></script>
-<!--    <script>-->
-<!--      if ('serviceWorker' in navigator) {-->
-<!--        navigator.serviceWorker-->
-<!--          .register('/serviceWorker.js')-->
-<!--          .then(() => console.log('Service Worker Registered'))-->
-<!--          .catch(err => console.error('Error registering service worker:', err))-->
-<!--      }-->
-<!--    </script>-->
+    <script>
+      if ('serviceWorker' in navigator) {
+        navigator.serviceWorker
+          .register('/serviceWorker.js')
+          .then(() => console.log('Service Worker Registered'))
+          .catch(err => console.error('Error registering service worker:', err))
+      }
+    </script>
   </body>
   <noscript>
     Please enable JavaScript in order for your browser to view the content of this page.
diff --git a/public/serviceWorker.js b/public/serviceWorker.js
index 8e18bb8..8f04c57 100644
--- a/public/serviceWorker.js
+++ b/public/serviceWorker.js
@@ -1,13 +1,9 @@
-const CACHE_NAME = 'v1'
+const CACHE_NAME = 'v2'
 const urlsToCache = [
-  '.',
+  '/',
   '/assets/img/CreamLogo.png',
-  '/client/styles/button.js',
-  '/client/styles/contact.js',
-  '/client/styles/GlobalStyles.js',
-  '/client/styles/work.js',
-  'main.bundle.js',
-  'index.html',
+  '/main.js',
+  '/index.html',
   'https://fonts.googleapis.com/css?family=Open+Sans:300,800',
 ]
 
@@ -15,9 +11,11 @@ const urlsToCache = [
 const containsChromeExtension = ({ url }) =>
   url.startsWith('chrome-extension') ||
   url.includes('extension') ||
-  url.startsWith('http')
+  !url.startsWith('http')
 
 self.addEventListener('install', evt => {
+  self.skipWaiting()
+
   // Perform install steps
   evt.waitUntil(
     caches.open(CACHE_NAME).then(cache => {
@@ -27,6 +25,20 @@ self.addEventListener('install', evt => {
   )
 })
 
+self.addEventListener('activate', evt => {
+  // Clean up old caches
+  evt.waitUntil(
+    caches
+      .keys()
+      .then(keys =>
+        Promise.all(
+          keys.filter(key => key !== CACHE_NAME).map(key => caches.delete(key))
+        )
+      )
+      .then(() => self.clients.claim())
+  )
+})
+
 self.addEventListener('fetch', evt => {
   if (containsChromeExtension(evt.request)) {
     return