diff --git a/.github/workflows/e2e-tests-readonly.yml b/.github/workflows/e2e-tests-readonly.yml
index 92e1e4b2..88f82ec9 100644
--- a/.github/workflows/e2e-tests-readonly.yml
+++ b/.github/workflows/e2e-tests-readonly.yml
@@ -4,7 +4,7 @@ on:
     branches: [ master ]
 jobs:
   test:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     services:
       postgres:
         image: postgres:12.2
@@ -28,7 +28,7 @@ jobs:
           node-version: '14'
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.0.3'
+          ruby-version: '3.0.4'
       - name: Cache Mastodon bundler
         uses: actions/cache@v3
         with:
diff --git a/.github/workflows/e2e-tests-readwrite.yml b/.github/workflows/e2e-tests-readwrite.yml
index 76d832ff..03007e94 100644
--- a/.github/workflows/e2e-tests-readwrite.yml
+++ b/.github/workflows/e2e-tests-readwrite.yml
@@ -4,7 +4,7 @@ on:
     branches: [ master ]
 jobs:
   test:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     services:
       postgres:
         image: postgres:12.2
@@ -28,7 +28,7 @@ jobs:
           node-version: '14'
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.0.3'
+          ruby-version: '3.0.4'
       - name: Cache Mastodon bundler
         uses: actions/cache@v3
         with:
diff --git a/bin/mastodon-config.js b/bin/mastodon-config.js
index fbf847a4..144839bd 100644
--- a/bin/mastodon-config.js
+++ b/bin/mastodon-config.js
@@ -19,9 +19,9 @@ BIND=0.0.0.0
 `
 
 export const GIT_URL = 'https://github.com/tootsuite/mastodon.git'
-export const GIT_TAG = 'v3.5.3'
+export const GIT_TAG = 'v4.0.2'
 
-export const RUBY_VERSION = '3.0.3'
+export const RUBY_VERSION = '3.0.4'
 
 const __dirname = path.dirname(new URL(import.meta.url).pathname)
 export const mastodonDir = path.join(__dirname, '../mastodon')