diff --git a/.gitmodules b/.gitmodules
index 9f6bb0138e..6f4e86ed19 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "external/oasis-core"]
 	path = external/oasis-core
 	url = https://github.com/oasisprotocol/oasis-core
-	branch = stable/24.0.x
+	branch = stable/24.2.x
 [submodule "external/oasis-sdk"]
 	path = external/oasis-sdk
 	url = https://github.com/oasisprotocol/oasis-sdk
diff --git a/external/cli b/external/cli
index ff10504c32..6e2926c911 160000
--- a/external/cli
+++ b/external/cli
@@ -1 +1 @@
-Subproject commit ff10504c328ec55ff8e1e2edc265d75ede3e4850
+Subproject commit 6e2926c9113f3ea4aef71d915792e9fdf392c5f4
diff --git a/external/oasis-core b/external/oasis-core
index fb49717f3c..18da8bc49d 160000
--- a/external/oasis-core
+++ b/external/oasis-core
@@ -1 +1 @@
-Subproject commit fb49717f3ceeec068caa6ea5df360380a39e055c
+Subproject commit 18da8bc49d92a543795246b8bb7fb574df070eec
diff --git a/sidebarGeneral.ts b/sidebarGeneral.ts
index 8e707a393f..2f5c641705 100644
--- a/sidebarGeneral.ts
+++ b/sidebarGeneral.ts
@@ -87,6 +87,7 @@ export const sidebarGeneral: SidebarsConfig = {
             'general/manage-tokens/cli/account',
             'general/manage-tokens/cli/transaction',
             'general/manage-tokens/cli/addressbook',
+            'general/manage-tokens/cli/rofl',
           ]
         },
         'general/manage-tokens/faq',
diff --git a/src/editUrl.ts b/src/editUrl.ts
index fc62b9aff7..dffb79d8b1 100644
--- a/src/editUrl.ts
+++ b/src/editUrl.ts
@@ -5,7 +5,7 @@ import type { EditUrlFunction } from '@docusaurus/plugin-content-docs'
 const gitModules = {
     'external/adrs/': 'https://github.com/oasisprotocol/adrs/{mode}/main/',
     'external/cli/': 'https://github.com/oasisprotocol/cli/{mode}/master/',
-    'external/oasis-core/': 'https://github.com/oasisprotocol/oasis-core/{mode}/stable/22.2.x/',
+    'external/oasis-core/': 'https://github.com/oasisprotocol/oasis-core/{mode}/stable/24.2.x/',
     'external/oasis-sdk/': 'https://github.com/oasisprotocol/oasis-sdk/{mode}/main/',
     'external/sapphire-paratime/': 'https://github.com/oasisprotocol/sapphire-paratime/{mode}/main/',
 };
diff --git a/src/remark/cross-repo-links.ts b/src/remark/cross-repo-links.ts
index 8b582b6646..0c05dba208 100644
--- a/src/remark/cross-repo-links.ts
+++ b/src/remark/cross-repo-links.ts
@@ -5,6 +5,7 @@ import {visit} from 'unist-util-visit';
 const cliRegex = /https:\/\/github\.com\/oasisprotocol\/cli\/blob\/master\/docs\/(.*)\.mdx?(#.*)?/;
 const oasisSdkContractRegex = /https:\/\/github\.com\/oasisprotocol\/oasis-sdk\/blob\/main\/docs\/contract\/(.*)\.mdx?(#.*)?/;
 const oasisSdkRuntimeRegex = /https:\/\/github\.com\/oasisprotocol\/oasis-sdk\/blob\/main\/docs\/runtime\/(.*)\.mdx?(#.*)?/;
+const oasisSdkRoflRegex = /https:\/\/github\.com\/oasisprotocol\/oasis-sdk\/blob\/main\/docs\/rofl\/(.*)\.mdx?(#.*)?/;
 const oasisCoreRegex = /https:\/\/github\.com\/oasisprotocol\/oasis-core\/blob\/master\/docs\/(.*)\.mdx?(#.*)?/;
 const adrsRegex = /https:\/\/github\.com\/oasisprotocol\/adrs\/blob\/main\/(.*)\.mdx?(#.*)?/;
 const sapphireParatimeRegex = /https:\/\/github\.com\/oasisprotocol\/sapphire-paratime\/blob\/main\/docs\/(.*)\.mdx?(#.*)?/;
@@ -31,6 +32,8 @@ export default function plugin(): Transformer {
             node.url = node.url.replace(oasisSdkContractRegex, '/dapp/cipher/$1$2');
         } else if (oasisSdkRuntimeRegex.test(node.url)) {
             node.url = node.url.replace(oasisSdkRuntimeRegex, '/paratime/$1$2');
+        } else if (oasisSdkRoflRegex.test(node.url)) {
+            node.url = node.url.replace(oasisSdkRoflRegex, '/rofl/$1$2');
         } else if (cliRegex.test(node.url)) {
             node.url = node.url.replace(cliRegex, '/general/manage-tokens/cli/$1$2');
         } else if (oasisCoreRegex.test(node.url)) {