diff --git a/synapse_rock/rockcraft.yaml b/synapse_rock/rockcraft.yaml
index 28e506f46..55cb2ac40 100644
--- a/synapse_rock/rockcraft.yaml
+++ b/synapse_rock/rockcraft.yaml
@@ -13,7 +13,7 @@ platforms:
 environment: &mas-source
   source: https://github.com/element-hq/matrix-authentication-service
   source-type: git
-  source-tag: v1.2.0
+  source-tag: v1.4.1
 parts:
   scripts:
     plugin: dump
@@ -204,12 +204,13 @@ parts:
     <<: *mas-source
     source-subdir: frontend
     build-environment:
-      - NODE_URI: "https://nodejs.org/dist/v20.18.1/node-v20.18.1-linux-x64.tar.gz"
+      - NODE_URI: "https://nodejs.org/dist/v22.19.0/node-v22.19.0-linux-x64.tar.gz"
     override-build: |
       curl -Ls $NODE_URI | tar xzf - -C /usr/ --skip-old-files --no-same-owner --strip-components=1
       (cd $CRAFT_PART_BUILD/frontend; npm ci; npm run build)
       mkdir -p $CRAFT_PART_INSTALL/mas/share/assets
       cp frontend/dist/manifest.json $CRAFT_PART_INSTALL/mas/share/manifest.json
+      rm -f frontend/dist/index.html* frontend/dist/manifest.json*
       cp -r frontend/dist/* $CRAFT_PART_INSTALL/mas/share/assets
     stage:
       - mas/share/*
diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py
index b484510de..2eeb2eb82 100644
--- a/tests/integration/conftest.py
+++ b/tests/integration/conftest.py
@@ -129,17 +129,13 @@ async def synapse_app_fixture(
     await app.set_config({"public_baseurl": f"http://{synapse_ip}:8080"})
 
     async with ops_test.fast_forward():
-        await model.relate(f"{synapse_app_name}:mas-database", f"{postgresql_app.name}")
-        await model.wait_for_idle(
-            apps=[synapse_app_name, postgresql_app.name],
-            status=ACTIVE_STATUS_NAME,
-            idle_period=5,
-        )
         await model.relate(f"{synapse_app_name}:database", f"{postgresql_app.name}")
+        await model.relate(f"{synapse_app_name}:mas-database", f"{postgresql_app.name}:database")
         await model.wait_for_idle(
             apps=[synapse_app_name, postgresql_app.name],
             status=ACTIVE_STATUS_NAME,
             idle_period=5,
+            raise_on_error=False,
         )
     return app