diff --git a/.github/workflows/e2e_all.yml b/.github/workflows/e2e_all.yml
index e0386f9..3e649dd 100644
--- a/.github/workflows/e2e_all.yml
+++ b/.github/workflows/e2e_all.yml
@@ -17,6 +17,8 @@ jobs:
       fail-fast: false
       matrix:
         version:
+          - 1.21.1
+          - 1.20.6
           - 1.20.4
           - 1.19.4
           - 1.18.2
diff --git a/.github/workflows/e2e_notable.yml b/.github/workflows/e2e_notable.yml
index e65808f..501c549 100644
--- a/.github/workflows/e2e_notable.yml
+++ b/.github/workflows/e2e_notable.yml
@@ -20,6 +20,7 @@ jobs:
       fail-fast: false
       matrix:
         version:
+          - 1.21.1
           - 1.16.5
           - 1.16.3
           - 1.13.2
@@ -39,7 +40,7 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - 1.20.4
+          - 1.20.6
         proxy:
           - velocity
           - bungeecord
diff --git a/tests_e2e/run.py b/tests_e2e/run.py
index 3bdcf26..81d3369 100755
--- a/tests_e2e/run.py
+++ b/tests_e2e/run.py
@@ -81,7 +81,9 @@
         ))
     ),
     **(
-        dict((version, {}) for version in (
+        dict((version, {
+            'java': 17,
+        }) for version in (
             '1.17.1',
             '1.18.2',
             '1.19.3',
@@ -95,6 +97,7 @@
         dict((
             version,
             {
+                'java': 17,
                 'folia': True,
             },
         ) for version in (
@@ -105,9 +108,32 @@
         dict((
             version,
             {
+                'java': 21,
+                'folia': True,
+            },
+        ) for version in (
+            '1.20.6',
+        ))
+    ),
+    **(
+        dict((
+            version,
+            {
+                'java': 21,
+            },
+        ) for version in (
+            '1.21.1',
+        ))
+    ),
+    **(
+        dict((
+            version,
+            {
+                'java': 21,
                 'bot': False,
             },
         ) for version in (
+            '1.21.3',
         ))
     ),
 }
@@ -214,7 +240,7 @@ def save(data):
     ]
 
     debug_level = int(environ.get("DEBUG")) if environ.get("DEBUG") else 0
-    debug = debug_level or environ.get("ACTIONS_STEP_DEBUG") == "true"
+    debug = debug_level > 0
     basicConfig(
         level=DEBUG if debug else INFO
     )
@@ -286,16 +312,14 @@ def save(data):
         bot_container = None
         assert action not in ("test",)
 
-    if "java" in version_info:
-        server_java_version = version_info["java"]
-    else:
-        server_java_version = 17
-
     if "server" in version_info:
         server_version = version_info["server"]
     else:
         server_version = client_version
 
+    assert "java" in version_info, f"java version for {server_version} is not defined"
+    server_java_version = version_info["java"]
+
     if "world" in version_info:
         world_version = version_info["world"]
     else:
@@ -470,6 +494,7 @@ def save(data):
                 ] if debug else [
                     '-f',
                     'bot',
+                    *servers,
                 ])
             ],
             stdout=PIPE,