diff --git a/.devcontainer b/.devcontainer
index 9392dab6..c5f5fb7b 160000
--- a/.devcontainer
+++ b/.devcontainer
@@ -1 +1 @@
-Subproject commit 9392dab66088da3b820424480218fc88492927c7
+Subproject commit c5f5fb7b3527c217c60e6f4e872b34a47dbecb53
diff --git a/.github/workflows/xpbuild.yml b/.github/workflows/xpbuild.yml
index b9166a83..70e7cbb5 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.05.2
-    with:
-      cmake-workflow-preset: LinuxRelease
-      runon: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: write
+      packages: write
+    uses: externpro/externpro/.github/workflows/build-linux.yml@25.07.1
     secrets: inherit
-  linux-arm64:
-    uses: externpro/externpro/.github/workflows/build-linux.yml@25.05.2
     with:
       cmake-workflow-preset: LinuxRelease
-      runon: ubuntu-24.04-arm
-    secrets: inherit
   macos:
-    uses: externpro/externpro/.github/workflows/build-macos.yml@25.05.2
+    uses: externpro/externpro/.github/workflows/build-macos.yml@25.07.1
+    secrets: inherit
     with:
       cmake-workflow-preset: DarwinRelease
-    secrets: inherit
   windows:
-    uses: externpro/externpro/.github/workflows/build-windows.yml@25.05.2
+    uses: externpro/externpro/.github/workflows/build-windows.yml@25.07.1
+    secrets: inherit
     with:
       cmake-workflow-preset: WindowsRelease
-    secrets: inherit
diff --git a/.github/workflows/xprelease.yml b/.github/workflows/xprelease.yml
index 273199e9..dbac778e 100644
--- a/.github/workflows/xprelease.yml
+++ b/.github/workflows/xprelease.yml
@@ -9,10 +9,9 @@ on:
 jobs:
   # Upload build artifacts as release assets
   release-from-build:
-    uses: externpro/externpro/.github/workflows/release-from-build.yml@25.05.2
+    uses: externpro/externpro/.github/workflows/release-from-build.yml@25.07.1
     with:
       workflow_run_url: ${{ github.event.inputs.workflow_run_url }}
-      artifact_pattern: "*.tar.xz"
     permissions:
       contents: write
       id-token: write
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a302002b..e238f07c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,10 +10,8 @@ OPTION(BUILD_SHARED_LIBS "Build shared libraries" ON)
 # Where to look for cmake modules
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
 
-INCLUDE(GNUInstallDirs)
 INCLUDE(YasmMacros)
 INCLUDE(VersionGen)
-INCLUDE(xpflags)
 
 OPTION(ENABLE_NLS "Enable message translations" OFF)
 
@@ -39,16 +37,14 @@ INCLUDE_DIRECTORIES(AFTER ${CMAKE_BINARY_DIR} ${yasm_SOURCE_DIR})
 INCLUDE(ConfigureChecks.cmake)
 
 OPTION(XP_INSTALL_YASM_EXE_ONLY "Only install the yasm executable" OFF)
-if(NOT DEFINED XP_INSTALL_CMAKEDIR)
-  set(XP_INSTALL_CMAKEDIR ${CMAKE_INSTALL_DATADIR}/cmake)
-endif()
 SET(targetsFile ${PROJECT_NAME}-targets)
-set(exe ${PROJECT_NAME})
-if(DEFINED XP_NAMESPACE)
-  set(nameSpace NAMESPACE ${XP_NAMESPACE}::)
-  string(PREPEND exe "${XP_NAMESPACE}::")
-endif()
-xpPackageDevel(TARGETS_FILE ${targetsFile} EXE ${exe})
+xpExternPackage(NAMESPACE ${XP_NAMESPACE}
+  TARGETS_FILE ${targetsFile} EXE ${PROJECT_NAME}
+  BASE v1.3.0 XPDIFF "patch"
+  WEB "http://yasm.tortall.net/" UPSTREAM "github.com/yasm/yasm"
+  DESC "assembler and disassembler for the Intel x86 architecture"
+  LICENSE "[BSD-2-Clause](https://github.com/yasm/yasm/blob/v1.3.0/COPYING 'BSD 2-Clause Simplified License')"
+  )
 
 ADD_SUBDIRECTORY(tools)
 ADD_SUBDIRECTORY(libyasm)
@@ -56,7 +52,10 @@ ADD_SUBDIRECTORY(modules)
 ADD_SUBDIRECTORY(frontends)
 
 if(XP_INSTALL_YASM_EXE_ONLY)
-INSTALL(EXPORT ${targetsFile} DESTINATION ${XP_INSTALL_CMAKEDIR} ${nameSpace})
+  if(DEFINED XP_NAMESPACE)
+    set(nameSpace NAMESPACE ${XP_NAMESPACE}::)
+  endif()
+  INSTALL(EXPORT ${targetsFile} DESTINATION ${XP_INSTALL_CMAKEDIR} ${nameSpace})
 endif()
 
 if(NOT XP_INSTALL_YASM_EXE_ONLY)