diff --git a/ci.jsonnet b/ci.jsonnet
index 6e0a25f5..ae3e2632 100644
--- a/ci.jsonnet
+++ b/ci.jsonnet
@@ -241,7 +241,7 @@ local with(platform, java_release, timelimit="15:00") = {
     specVersion: "3",
 
     # Overlay
-    overlay: "4c0f01b4995da0869a88a54863ca99a30f8e75d5",
+    overlay: "352161e569db9522679e3949a791fbce455accf8",
 
     # For use by overlay
     versions:: versions,
diff --git a/common.json b/common.json
index 4889ded3..4cc86920 100644
--- a/common.json
+++ b/common.json
@@ -45,13 +45,13 @@
 
     "oraclejdk23":       {"name": "jpg-jdk",   "version": "23", "build_id": "jdk-23+37", "platformspecific": true, "extrabundles": ["static-libs"]},
 
-    "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "24",      "build_id": "jdk-24+27", "platformspecific": true, "extrabundles": ["static-libs"]},
-    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-24+27-jvmci-b01", "platformspecific": true },
-    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-24+27-jvmci-b01-debug", "platformspecific": true },
-    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-24+27-jvmci-b01-sulong", "platformspecific": true },
-    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-24+27-jvmci-b01", "platformspecific": true },
-    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-24+27-jvmci-b01-debug", "platformspecific": true },
-    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-24+27-jvmci-b01-sulong", "platformspecific": true }
+    "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "25",      "build_id": "jdk-25+1", "platformspecific": true, "extrabundles": ["static-libs"]},
+    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-25+1-jvmci-b01", "platformspecific": true },
+    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-25+1-jvmci-b01-debug", "platformspecific": true },
+    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-25+1-jvmci-b01-sulong", "platformspecific": true },
+    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-25+1-jvmci-b01", "platformspecific": true },
+    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-25+1-jvmci-b01-debug", "platformspecific": true },
+    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-25+1-jvmci-b01-sulong", "platformspecific": true }
   },
 
   "eclipse": {
diff --git a/mx.mx/suite.py b/mx.mx/suite.py
index b20a0ccb..e8f99b31 100644
--- a/mx.mx/suite.py
+++ b/mx.mx/suite.py
@@ -1045,6 +1045,9 @@
           },
           "riscv64" : {
             "cflags" : ["-fPIC", "-Wall", "-Werror", "-O", "-g", "-DJVMTI_ASM_ARCH=riscv64", "-std=gnu99"],
+          },
+          "loongarch64" : {
+            "cflags" : ["-fPIC", "-Wall", "-Werror", "-O", "-g", "-DJVMTI_ASM_ARCH=loongarch64", "-std=gnu99"],
           }
         },
         "darwin": {
diff --git a/src/mx/_impl/mx.py b/src/mx/_impl/mx.py
index 445692fd..69557b2c 100755
--- a/src/mx/_impl/mx.py
+++ b/src/mx/_impl/mx.py
@@ -3868,6 +3868,8 @@ def _get_real_arch():
         return 'sparcv9'
     if machine in ['riscv64']:
         return 'riscv64'
+    if machine in ['loongarch64']:
+        return 'loongarch64'
     if machine == 'i386' and is_darwin():
         try:
             # Support for Snow Leopard and earlier version of MacOSX
@@ -18365,7 +18367,7 @@ def alarm_handler(signum, frame):
 _CACHE_DIR = get_env('MX_CACHE_DIR', join(dot_mx_dir(), 'cache'))
 
 # The version must be updated for every PR (checked in CI) and the comment should reflect the PR's issue
-version = VersionSpec("7.36.3")  # [GR-47807] Basic tests for codeowners.
+version = VersionSpec("7.36.4")  # 60580 - Support the Loongarch architecture
 
 _mx_start_datetime = datetime.utcnow()