diff --git a/.devcontainer b/.devcontainer
index a9d469d..aca2ba8 160000
--- a/.devcontainer
+++ b/.devcontainer
@@ -1 +1 @@
-Subproject commit a9d469d3aa8a45711c71b91630f4507f07f48358
+Subproject commit aca2ba80ab3f3009b7cdd6d33fb3bc89c24e27e2
diff --git a/.github/workflows/xpbuild.yml b/.github/workflows/xpbuild.yml
index fb55758..cf566b6 100644
--- a/.github/workflows/xpbuild.yml
+++ b/.github/workflows/xpbuild.yml
@@ -7,24 +7,17 @@ on:
   workflow_dispatch:
 jobs:
   linux:
-    uses: externpro/externpro/.github/workflows/build-linux.yml@25.05.1
+    uses: externpro/externpro/.github/workflows/build-linux.yml@25.07.3
     with:
       cmake-workflow-preset: LinuxRelease
-      runon: ubuntu-latest
-    secrets: inherit
-  linux-arm64:
-    uses: externpro/externpro/.github/workflows/build-linux.yml@25.05.1
-    with:
-      cmake-workflow-preset: LinuxRelease
-      runon: ubuntu-24.04-arm
     secrets: inherit
   macos:
-    uses: externpro/externpro/.github/workflows/build-macos.yml@25.05.1
+    uses: externpro/externpro/.github/workflows/build-macos.yml@25.07.3
     with:
       cmake-workflow-preset: DarwinRelease
     secrets: inherit
   windows:
-    uses: externpro/externpro/.github/workflows/build-windows.yml@25.05.1
+    uses: externpro/externpro/.github/workflows/build-windows.yml@25.07.3
     with:
       cmake-workflow-preset: WindowsRelease
     secrets: inherit
diff --git a/.github/workflows/xprelease.yml b/.github/workflows/xprelease.yml
index f868a82..86b6f88 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.1
+    uses: externpro/externpro/.github/workflows/release-from-build.yml@25.07.3
     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 e8489e1..9f174ff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,11 +1,10 @@
 cmake_minimum_required(VERSION 3.31)
 set(CMAKE_PROJECT_TOP_LEVEL_INCLUDES .devcontainer/cmake/xproinc.cmake)
 project(libiconv VERSION 1.18)
-include(GNUInstallDirs)
-include(xpflags)
-set(XP_INSTALL_CMAKEDIR ${CMAKE_INSTALL_DATADIR}/cmake)
-set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME devel)
-set(libName xpro::${PROJECT_NAME})
+if(DEFINED XP_NAMESPACE)
+  set(nameSpace ${XP_NAMESPACE}::)
+endif()
+set(libName ${nameSpace}${PROJECT_NAME})
 if(WIN32)
   install(FILES iconv.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
   install(FILES x64/ReleaseStatic/libiconvStatic.lib DESTINATION ${CMAKE_INSTALL_LIBDIR})
@@ -44,4 +43,11 @@ else()
     ""
     )
 endif()
-xpPackageDevel()
+if(DEFINED XP_NAMESPACE)
+  xpExternPackage(NAMESPACE ${XP_NAMESPACE}
+    LIBRARIES ${PROJECT_NAME} BASE v0 XPDIFF "bin"
+    WEB "https://www.gnu.org/software/libiconv/" UPSTREAM "github.com/pffang/libiconv-for-Windows/releases/tag/1.18-eed6782"
+    DESC "character set conversion library"
+    LICENSE "[LGPL-2.1](https://savannah.gnu.org/projects/libiconv/ 'LGPL version 2.1')"
+    )
+endif()
diff --git a/CMakePresetsBase.json b/CMakePresetsBase.json
index 09653d8..4489d79 100644
--- a/CMakePresetsBase.json
+++ b/CMakePresetsBase.json
@@ -4,7 +4,16 @@
     {
       "name": "config-base",
       "hidden": true,
-      "binaryDir": "${sourceDir}/_bld-${presetName}"
+      "binaryDir": "${sourceDir}/_bld-${presetName}",
+      "cacheVariables": {
+        "XP_NAMESPACE": "xpro"
+      }
+    }
+  ],
+  "buildPresets": [
+    {
+      "name": "build-base",
+      "hidden": true
     }
   ]
 }