diff --git a/authentication/src/app/service-worker.ts b/authentication/src/app/service-worker.ts
index 0538ba3..b9741f4 100644
--- a/authentication/src/app/service-worker.ts
+++ b/authentication/src/app/service-worker.ts
@@ -1,18 +1,24 @@
-import type { PrecacheEntry } from '@serwist/precaching';
-import { installSerwist } from '@serwist/sw';
 import { defaultCache } from '@serwist/next/worker';
+import type { PrecacheEntry, SerwistGlobalConfig } from 'serwist';
+import { Serwist } from 'serwist';
 
-declare const self: ServiceWorkerGlobalScope & {
-    // Change this attribute's name to your `injectionPoint`.
-    // `injectionPoint` is an InjectManifest option.
-    // See https://serwist.pages.dev/docs/build/inject-manifest/configuring
-    __SW_MANIFEST: (PrecacheEntry | string)[] | undefined;
-};
+declare const self: ServiceWorkerGlobalScope;
 
-installSerwist({
+declare global {
+    interface WorkerGlobalScope extends SerwistGlobalConfig {
+        // Change this attribute's name to your `injectionPoint`.
+        // `injectionPoint` is an InjectManifest option.
+        // See https://serwist.pages.dev/docs/build/configuring
+        __SW_MANIFEST: (PrecacheEntry | string)[] | undefined;
+    }
+}
+
+const serwist = new Serwist({
     precacheEntries: self.__SW_MANIFEST,
     skipWaiting: true,
     clientsClaim: true,
     navigationPreload: true,
     runtimeCaching: defaultCache,
 });
+
+serwist.addEventListeners();
diff --git a/dashboard/src/app/service-worker.ts b/dashboard/src/app/service-worker.ts
index 0538ba3..b9741f4 100644
--- a/dashboard/src/app/service-worker.ts
+++ b/dashboard/src/app/service-worker.ts
@@ -1,18 +1,24 @@
-import type { PrecacheEntry } from '@serwist/precaching';
-import { installSerwist } from '@serwist/sw';
 import { defaultCache } from '@serwist/next/worker';
+import type { PrecacheEntry, SerwistGlobalConfig } from 'serwist';
+import { Serwist } from 'serwist';
 
-declare const self: ServiceWorkerGlobalScope & {
-    // Change this attribute's name to your `injectionPoint`.
-    // `injectionPoint` is an InjectManifest option.
-    // See https://serwist.pages.dev/docs/build/inject-manifest/configuring
-    __SW_MANIFEST: (PrecacheEntry | string)[] | undefined;
-};
+declare const self: ServiceWorkerGlobalScope;
 
-installSerwist({
+declare global {
+    interface WorkerGlobalScope extends SerwistGlobalConfig {
+        // Change this attribute's name to your `injectionPoint`.
+        // `injectionPoint` is an InjectManifest option.
+        // See https://serwist.pages.dev/docs/build/configuring
+        __SW_MANIFEST: (PrecacheEntry | string)[] | undefined;
+    }
+}
+
+const serwist = new Serwist({
     precacheEntries: self.__SW_MANIFEST,
     skipWaiting: true,
     clientsClaim: true,
     navigationPreload: true,
     runtimeCaching: defaultCache,
 });
+
+serwist.addEventListeners();