diff --git a/.devcontainer b/.devcontainer
index de12dc2..81d8f12 160000
--- a/.devcontainer
+++ b/.devcontainer
@@ -1 +1 @@
-Subproject commit de12dc208298d0090a6e9efadf9eafd6018a549c
+Subproject commit 81d8f12c7a6099bf9e2018aa0832707be7a271b1
diff --git a/.github/workflows/build.yml b/.github/workflows/xpbuild.yml
similarity index 77%
rename from .github/workflows/build.yml
rename to .github/workflows/xpbuild.yml
index 3b34b65..fb55758 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/xpbuild.yml
@@ -7,19 +7,24 @@ on:
   workflow_dispatch:
 jobs:
   linux:
-    uses: externpro/externpro/.github/workflows/build-linux.yml@25.04
+    uses: externpro/externpro/.github/workflows/build-linux.yml@25.05.1
     with:
       cmake-workflow-preset: LinuxRelease
       runon: ubuntu-latest
     secrets: inherit
   linux-arm64:
-    uses: externpro/externpro/.github/workflows/build-linux.yml@25.04
+    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
+    with:
+      cmake-workflow-preset: DarwinRelease
+    secrets: inherit
   windows:
-    uses: externpro/externpro/.github/workflows/build-windows.yml@25.04
+    uses: externpro/externpro/.github/workflows/build-windows.yml@25.05.1
     with:
       cmake-workflow-preset: WindowsRelease
     secrets: inherit
diff --git a/.github/workflows/release.yml b/.github/workflows/xprelease.yml
similarity index 83%
rename from .github/workflows/release.yml
rename to .github/workflows/xprelease.yml
index 6fa033b..f868a82 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/xprelease.yml
@@ -9,8 +9,12 @@ on:
 jobs:
   # Upload build artifacts as release assets
   release-from-build:
-    uses: externpro/externpro/.github/workflows/release-from-build.yml@25.04
+    uses: externpro/externpro/.github/workflows/release-from-build.yml@25.05.1
     with:
       workflow_run_url: ${{ github.event.inputs.workflow_run_url }}
       artifact_pattern: "*.tar.xz"
+    permissions:
+      contents: write
+      id-token: write
+      attestations: write
     secrets: inherit
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6e8c7e0..1349882 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,9 +1,8 @@
 cmake_minimum_required(VERSION 3.31)
-set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/.devcontainer/cmake)
-include(preproject)
-project(libiconv VERSION 1.18.3)
-include(flags)
+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})
diff --git a/CMakePresets.json b/CMakePresets.json
index 5a06690..f82cfdd 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -2,6 +2,7 @@
   "version": 8,
   "include": [
     ".devcontainer/cmake/presets/xpLinuxNinja.json",
+    ".devcontainer/cmake/presets/xpDarwinNinja.json",
     ".devcontainer/cmake/presets/xpWindowsVs2022.json"
   ]
 }