diff --git a/.prettierrc.cjs b/.prettierrc.cjs
index 7638b12e0..87949a8fb 100644
--- a/.prettierrc.cjs
+++ b/.prettierrc.cjs
@@ -9,5 +9,5 @@ module.exports = {
   singleQuote: true,
 
   pugSingleQuote: false,
-  printWidth: 120,
+  printWidth: 100,
 };
diff --git a/apps/badman-e2e/src/pages/assembly.page.ts b/apps/badman-e2e/src/pages/assembly.page.ts
index f0125bca1..909d8ca2d 100644
--- a/apps/badman-e2e/src/pages/assembly.page.ts
+++ b/apps/badman-e2e/src/pages/assembly.page.ts
@@ -34,7 +34,6 @@ export default class AssemblyPage {
   readonly overlay: Locator;
 
   constructor(page: Page) {
-    setup(page);
     this.page = page;
 
     this.clubInput = page.locator('badman-select-club input');
@@ -65,7 +64,11 @@ export default class AssemblyPage {
   }
 
   async goto() {
+    await setup(this.page);
     await this.page.goto('/competition/assembly');
+    await this.page.waitForResponse(
+      (resp) => resp.url().includes('/api/v1/translate/i18n') && resp.status() === 200,
+    );
   }
 
   /**
@@ -77,8 +80,15 @@ export default class AssemblyPage {
     await this.page.keyboard.press('ArrowDown');
     await this.page.keyboard.press('Enter');
 
+    await this.page.waitForResponse(
+      (resp) => resp.url().includes('/graphql') && resp.status() === 200,
+    );
+
     // wait for season to be loaded
-    await this.page.waitForSelector('badman-select-season');
+    await this.page.waitForSelector('badman-select-season', {
+      // this can take a wile on CI
+      timeout: 120_000,
+    });
   }
 
   /**
diff --git a/apps/badman/proxy.conf.json b/apps/badman/proxy.conf.json
index be066b8a6..66210afa4 100644
--- a/apps/badman/proxy.conf.json
+++ b/apps/badman/proxy.conf.json
@@ -10,6 +10,7 @@
   "/socket.io": {
     "target": "http://127.0.0.1:5000",
     "secure": false,
+    "logLevel": "silent",
     "ws": true
   }
 }