diff --git a/.github/workflows/mjolnir.yml b/.github/workflows/mjolnir.yml
index bb57961..85a2313 100644
--- a/.github/workflows/mjolnir.yml
+++ b/.github/workflows/mjolnir.yml
@@ -17,10 +17,10 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
-    - name: Specifically use node 16 like in the readme. 
+    - name: Specifically use node 18 like in the readme.
       uses: actions/setup-node@v3
       with:
-        node-version: '16'
+        node-version: '18'
     - run: yarn install
     - run: yarn build
     - run: yarn lint
@@ -29,10 +29,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - name: Specifically use node 16 like in the readme. 
+    - name: Specifically use node 18 like in the readme.
       uses: actions/setup-node@v3
       with:
-        node-version: '16'
+        node-version: '18'
     - run: yarn install
     - run: yarn test
   integration:
@@ -43,7 +43,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: actions/setup-node@v3
       with:
-        node-version: '16'
+        node-version: '18'
     - name: Fetch and build mx-tester (cached across runs)
       uses: baptiste0928/cargo-install@v1
       with:
@@ -65,7 +65,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: actions/setup-node@v3
       with:
-        node-version: '16'
+        node-version: '18'
     - name: Fetch and build mx-tester (cached across runs)
       uses: baptiste0928/cargo-install@v1
       with:
diff --git a/Dockerfile b/Dockerfile
index d0891b0..9cf5859 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # We can't use alpine anymore because crypto has rust deps.
-FROM node:16-slim
+FROM node:18-slim
 COPY . /tmp/src
 RUN cd /tmp/src \
     && yarn install \
diff --git a/docs/setup_selfbuild.md b/docs/setup_selfbuild.md
index 9e42fdb..5c87540 100644
--- a/docs/setup_selfbuild.md
+++ b/docs/setup_selfbuild.md
@@ -1,5 +1,5 @@
 These instructions are to build and run mjolnir without using [Docker](./setup_docker.md).
-To build mjolnir, you have to have installed [Node >=16](https://nodejs.org/en/download/), [npm](https://docs.npmjs.com/cli/v7/configuring-npm/install) and [yarn >1.x](https://classic.yarnpkg.com/en/docs/install).
+To build mjolnir, you have to have installed [Node >=18](https://nodejs.org/en/download/), [npm](https://docs.npmjs.com/cli/v7/configuring-npm/install) and [yarn >1.x](https://classic.yarnpkg.com/en/docs/install).
 
 Copy the latest release tag from https://github.com/matrix-org/mjolnir/releases/latest/ to use when cloning. For example `v1.6.1` - please check the link for the current version as this mentioned example might be outdated.
 
diff --git a/package.json b/package.json
index 1917ffa..3e4be54 100644
--- a/package.json
+++ b/package.json
@@ -64,6 +64,6 @@
     "yaml": "^2.2.2"
   },
   "engines": {
-    "node": ">=16.0.0"
+    "node": ">=18.0.0"
   }
 }
diff --git a/test/integration/fixtures.ts b/test/integration/fixtures.ts
index 921bd3b..a75dd6f 100644
--- a/test/integration/fixtures.ts
+++ b/test/integration/fixtures.ts
@@ -1,6 +1,9 @@
 import { read as configRead } from "../../src/config";
 import { makeMjolnir, teardownManagementRoom } from "./mjolnirSetupUtils";
 import { register } from "prom-client";
+import dns from 'node:dns';
+
+dns.setDefaultResultOrder('ipv4first');
 
 // When Mjolnir starts (src/index.ts) it clobbers the config by resolving the management room
 // alias specified in the config (config.managementRoom) and overwriting that with the room ID.