diff --git a/sw/device/silicon_owner/tock/apps/BUILD b/sw/device/silicon_owner/tock/apps/BUILD
index 3306c2b5dc15f..e0aa11061e339 100644
--- a/sw/device/silicon_owner/tock/apps/BUILD
+++ b/sw/device/silicon_owner/tock/apps/BUILD
@@ -9,7 +9,7 @@ package(default_visibility = ["//visibility:public"])
 ld_library(
     name = "libtock_layout",
     includes = [
-        "@libtock//runtime:layout",
+        "@libtock//build_scripts:layout",
     ],
 )
 
diff --git a/sw/device/silicon_owner/tock/apps/single_app_layout.ld b/sw/device/silicon_owner/tock/apps/single_app_layout.ld
index bda00925dafbf..64c85d9caeea3 100644
--- a/sw/device/silicon_owner/tock/apps/single_app_layout.ld
+++ b/sw/device/silicon_owner/tock/apps/single_app_layout.ld
@@ -14,4 +14,4 @@ RAM_LENGTH = 512K;
 
 /* TODO(cfrantz): Fix the ld_library rule to allow include paths and avoid  */
 /* having to specify an `external` path here */
-INCLUDE external/libtock/runtime/libtock_layout.ld
+INCLUDE external/libtock/build_scripts/libtock_layout.ld
diff --git a/third_party/tock/repos.bzl b/third_party/tock/repos.bzl
index 09a030bd1771d..f5f00fb2f95f6 100644
--- a/third_party/tock/repos.bzl
+++ b/third_party/tock/repos.bzl
@@ -40,9 +40,9 @@ def tock_repos(tock = None, libtock = None, elf2tab = None):
     bare_repository(
         name = "tock",
         local = tock,
-        strip_prefix = "tock-3a0527d586702b8ae8cb242391fa72eb3a412f49",
-        url = "https://github.com/tock/tock/archive/3a0527d586702b8ae8cb242391fa72eb3a412f49.tar.gz",
-        sha256 = "8108d5b2bf8bc5c6b8c1ca09940c96b0b8c2541a8215293234f32803464cd748",
+        strip_prefix = "tock-8b28201bce7dd7b832de469b34a83457b2cc4ceb",
+        url = "https://github.com/tock/tock/archive/8b28201bce7dd7b832de469b34a83457b2cc4ceb.tar.gz",
+        sha256 = "91d00204db504d191a6bf4edaa4520f465a57547971b472f80583f45c3f1c4a5",
         additional_files_content = {
             "BUILD": """exports_files(glob(["**"]))""",
             "arch/riscv/BUILD": crate_build(
@@ -152,9 +152,9 @@ def tock_repos(tock = None, libtock = None, elf2tab = None):
     bare_repository(
         name = "libtock",
         local = libtock,
-        strip_prefix = "libtock-rs-49779965a9575b03ef96df703bd2fc4b2f080a0c",
-        url = "https://github.com/tock/libtock-rs/archive/49779965a9575b03ef96df703bd2fc4b2f080a0c.tar.gz",
-        sha256 = "51355f3fd2361b10d37c7af0af0635ecb9645c1f03a19024f9f8427471d31971",
+        strip_prefix = "libtock-rs-cda873797a4a2937ccc13da75d0c74c04fab0a23",
+        url = "https://github.com/tock/libtock-rs/archive/cda873797a4a2937ccc13da75d0c74c04fab0a23.tar.gz",
+        sha256 = "a7c164ae64b5557ad0e21d400ba1ade58ed112cbecc4e545a69b3f7ff125bb94",
         additional_files_content = {
             "BUILD": crate_build(
                 name = "libtock",
@@ -251,6 +251,11 @@ def tock_repos(tock = None, libtock = None, elf2tab = None):
                 crate_name = "libtock_{name}",
                 deps = ["//platform"],
             ),
+            "build_scripts/BUILD": crate_build(
+                name = "build_scripts",
+                crate_name = "libtock_{name}",
+                additional_build_file_content = _LIBTOCK_LAYOUT,
+            ),
             "panic_handlers/debug_panic/BUILD": crate_build(
                 name = "debug_panic",
                 crate_name = "libtock_{name}",
@@ -277,11 +282,9 @@ def tock_repos(tock = None, libtock = None, elf2tab = None):
             "runtime/BUILD": crate_build(
                 name = "runtime",
                 crate_name = "libtock_{name}",
-                crate_features = ["no_auto_layout"],
                 deps = [
                     "//platform",
                 ],
-                additional_build_file_content = _LIBTOCK_LAYOUT,
             ),
         },
     )
diff --git a/third_party/tock/tockloader_requirements.txt b/third_party/tock/tockloader_requirements.txt
index ddd76418e25e2..5b3a552388aaa 100644
--- a/third_party/tock/tockloader_requirements.txt
+++ b/third_party/tock/tockloader_requirements.txt
@@ -1,13 +1,11 @@
 argcomplete==3.1.1
 colorama==0.4.6
 crcmod==1.7
-prompt-toolkit==3.0.39
 pycryptodome==3.18.0
 pyserial==3.5
 questionary==1.10.0
 siphash==0.0.1
 # tockloader==1.10.0
-tockloader@git+https://github.com/lschuermann/tockloader.git@1c585a4e0f43b180d6a47b336aba98982e0e6396
+tockloader@git+https://github.com/tock/tockloader.git@823e21bb4ae6ff9bbb30393f48ce5b23feb9f023
 toml==0.10.2
 tqdm==4.65.0
-wcwidth==0.2.6