diff --git a/.devcontainer b/.devcontainer
index d778368c70b3..1d90efbd8f07 160000
--- a/.devcontainer
+++ b/.devcontainer
@@ -1 +1 @@
-Subproject commit d778368c70b3d147f0487c844e260373f29334d1
+Subproject commit 1d90efbd8f07dfe7eaee2db2585b5ff214d7f615
diff --git a/.github/workflows/xpbuild.yml b/.github/workflows/xpbuild.yml
index 33ec5df0308c..76bd3cd14e04 100644
--- a/.github/workflows/xpbuild.yml
+++ b/.github/workflows/xpbuild.yml
@@ -1,4 +1,7 @@
 name: Build
+permissions:
+  contents: read
+  pull-requests: write
 on:
   push:
     branches: [ "dev" ]
@@ -7,24 +10,21 @@ on:
   workflow_dispatch:
 jobs:
   linux:
-    uses: externpro/externpro/.github/workflows/build-linux.yml@25.06
+    permissions:
+      contents: read
+      pull-requests: write
+      packages: write
+    uses: externpro/externpro/.github/workflows/build-linux.yml@main
     with:
       cmake-workflow-preset: LinuxRelease
-      runon: ubuntu-latest
-    secrets: inherit
-  linux-arm64:
-    uses: externpro/externpro/.github/workflows/build-linux.yml@25.06
-    with:
-      cmake-workflow-preset: LinuxRelease
-      runon: ubuntu-24.04-arm
     secrets: inherit
   macos:
-    uses: externpro/externpro/.github/workflows/build-macos.yml@25.06
+    uses: externpro/externpro/.github/workflows/build-macos.yml@main
     with:
       cmake-workflow-preset: DarwinRelease
     secrets: inherit
   windows:
-    uses: externpro/externpro/.github/workflows/build-windows.yml@25.06
+    uses: externpro/externpro/.github/workflows/build-windows.yml@main
     with:
       cmake-workflow-preset: WindowsRelease
     secrets: inherit
diff --git a/tools/cmake b/tools/cmake
index 411b8dd57360..b0e7973d4026 160000
--- a/tools/cmake
+++ b/tools/cmake
@@ -1 +1 @@
-Subproject commit 411b8dd5736036176a5b51408e6a3c62cd82aab4
+Subproject commit b0e7973d4026a8d29d8db9599f0f19a35c84d7d0