diff --git a/ci.jsonnet b/ci.jsonnet
index ed06e0e4f2..bff43aa641 100644
--- a/ci.jsonnet
+++ b/ci.jsonnet
@@ -310,15 +310,15 @@
         "tox-example": gpgate_ee + require(GPYEE_NATIVE_STANDALONE) + platform_spec(no_jobs) + platform_spec({
             "linux:amd64:jdk-latest"     : tier3,
         }),
-        "python-svm-graalos-standalone-build": gpgate_ee + internet_access_env + platform_spec(no_jobs) + platform_spec({
-            "linux:amd64:jdk-latest": tier3 + $.ol8 + task_spec({
-                environment +: {
-                    GRAALPY_GRAALOS_TOOLCHAIN_URL: $.overlay_imports.GRAALPY_GRAALOS_TOOLCHAIN_URL,
-                    GRAALPY_GRAALOS_RUNTIME_URL: $.overlay_imports.GRAALPY_GRAALOS_RUNTIME_URL,
-                    GRAALPY_GRAALOS_ARTIFACT_BASE_URL: $.overlay_imports.GRAALPY_GRAALOS_ARTIFACT_BASE_URL,
-                },
-            }),
-        }),
+        // "python-svm-graalos-standalone-build": gpgate_ee + internet_access_env + platform_spec(no_jobs) + platform_spec({
+        //     "linux:amd64:jdk-latest": tier3 + $.ol8 + task_spec({
+        //         environment +: {
+        //             GRAALPY_GRAALOS_TOOLCHAIN_URL: $.overlay_imports.GRAALPY_GRAALOS_TOOLCHAIN_URL,
+        //             GRAALPY_GRAALOS_RUNTIME_URL: $.overlay_imports.GRAALPY_GRAALOS_RUNTIME_URL,
+        //             GRAALPY_GRAALOS_ARTIFACT_BASE_URL: $.overlay_imports.GRAALPY_GRAALOS_ARTIFACT_BASE_URL,
+        //         },
+        //     }),
+        // }),
     },
 
     local need_pgo = task_spec({runAfter: ["python-pgo-profile-post_merge-linux-amd64-jdk-latest"]}),
diff --git a/ci/graal/ci/ci_common/common.jsonnet b/ci/graal/ci/ci_common/common.jsonnet
index 1405227b1f..e5914adc2f 100644
--- a/ci/graal/ci/ci_common/common.jsonnet
+++ b/ci/graal/ci/ci_common/common.jsonnet
@@ -136,6 +136,7 @@ common + common.frequencies + {
   },
 
   linux_amd64: common.linux_amd64 + graal_common_extras + linux_deps_extras,
+  linux_amd64_ol8: common.linux_amd64_ol8 + graal_common_extras + linux_deps_extras,
   linux_amd64_ol9: common.linux_amd64_ol9 + graal_common_extras + linux_deps_extras,
   linux_amd64_ubuntu: common.linux_amd64_ubuntu + graal_common_extras,
   linux_aarch64: common.linux_aarch64 + graal_common_extras + linux_deps_extras,
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_mmap.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_mmap.txt
index a7065a7d9d..2189176fb5 100644
--- a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_mmap.txt
+++ b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_mmap.txt
@@ -9,7 +9,7 @@ test.test_mmap.MmapTests.test_double_close @ darwin-arm64,linux-aarch64,linux-aa
 test.test_mmap.MmapTests.test_empty_file @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_mmap.MmapTests.test_entire_file @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_mmap.MmapTests.test_extended_set_del_slice @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
-test.test_mmap.MmapTests.test_find_does_not_access_beyond_buffer @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github
+test.test_mmap.MmapTests.test_find_does_not_access_beyond_buffer @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64
 test.test_mmap.MmapTests.test_find_end @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_mmap.MmapTests.test_flush_return_value @ darwin-arm64,win32-AMD64,win32-AMD64-github
 test.test_mmap.MmapTests.test_length_0_large_offset @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64-github
diff --git a/mx.graalpython/suite.py b/mx.graalpython/suite.py
index e8132f11c4..acb8028d1f 100644
--- a/mx.graalpython/suite.py
+++ b/mx.graalpython/suite.py
@@ -53,7 +53,7 @@
             },
             {
                 "name": "tools",
-                "version": "2143cd9f4e3c06b5518d1cbd23c09a918bc9cb58",
+                "version": "4e3166d0bbb8092e1c39a117acfb9e2ebf0db7ef",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
@@ -61,7 +61,7 @@
             },
             {
                 "name": "regex",
-                "version": "2143cd9f4e3c06b5518d1cbd23c09a918bc9cb58",
+                "version": "4e3166d0bbb8092e1c39a117acfb9e2ebf0db7ef",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},