diff --git a/.devcontainer b/.devcontainer
index 1d9cc0c5..0b861805 160000
--- a/.devcontainer
+++ b/.devcontainer
@@ -1 +1 @@
-Subproject commit 1d9cc0c51d655b07af3dc8b6d0783c52a99b7eb3
+Subproject commit 0b861805c25585a935cc18533afb925f0b93f7da
diff --git a/.github/workflows/xpbuild.yml b/.github/workflows/xpbuild.yml
index f0192ca9..169ff526 100644
--- a/.github/workflows/xpbuild.yml
+++ b/.github/workflows/xpbuild.yml
@@ -7,24 +7,24 @@ on:
   workflow_dispatch:
 jobs:
   linux:
-    uses: externpro/externpro/.github/workflows/build-linux.yml@25.05.2
+    uses: externpro/externpro/.github/workflows/build-linux.yml@25.06
     with:
       cmake-workflow-preset: Linux
       runon: ubuntu-latest
     secrets: inherit
   linux-arm64:
-    uses: externpro/externpro/.github/workflows/build-linux.yml@25.05.2
+    uses: externpro/externpro/.github/workflows/build-linux.yml@25.06
     with:
       cmake-workflow-preset: Linux
       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.06
     with:
       cmake-workflow-preset: Darwin
     secrets: inherit
   windows:
-    uses: externpro/externpro/.github/workflows/build-windows.yml@25.05.2
+    uses: externpro/externpro/.github/workflows/build-windows.yml@25.06
     with:
       cmake-workflow-preset: Windows
     secrets: inherit
diff --git a/.github/workflows/xprelease.yml b/.github/workflows/xprelease.yml
index 273199e9..14619146 100644
--- a/.github/workflows/xprelease.yml
+++ b/.github/workflows/xprelease.yml
@@ -9,7 +9,7 @@ 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.06
     with:
       workflow_run_url: ${{ github.event.inputs.workflow_run_url }}
       artifact_pattern: "*.tar.xz"
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 796e29bb..320e9d94 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,7 @@ if(NOT DEFINED XP_INSTALL_CMAKEDIR)
   set(XP_INSTALL_CMAKEDIR ${CMAKE_INSTALL_DATADIR}/cmake)
 endif()
 set(targetsFile ${PROJECT_NAME}-targets)
-xpPackageDevel(TARGETS_FILE ${targetsFile} DEPS expat openssl LIBRARIES ${lib})
+xpPackageDevel(TARGETS_FILE ${targetsFile} DEPS libexpat openssl LIBRARIES ${lib})
 enable_testing()
 set_property(GLOBAL PROPERTY USE_FOLDERS ON) # enables MSVC Solution Folders
 ########################################
@@ -25,9 +25,9 @@ if(MSVC)
 endif()
 ########################################
 find_package(OpenSSL)
-find_package(EXPAT)
-if(NOT EXPAT_FOUND)
-  message(FATAL_ERROR "can't find expat - libstrophe cmake currently hard-coded to use expat")
+find_package(libexpat)
+if(NOT LIBEXPAT_FOUND)
+  message(FATAL_ERROR "can't find libexpat - libstrophe cmake currently hard-coded to use libexpat")
 endif()
 if(NOT OPENSSL_FOUND)
   message(FATAL_ERROR "can't find OpenSSL - libstrophe cmake currently hard-coded to use OpenSSL")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0971423a..75208a1a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -46,7 +46,7 @@ add_library(${lib_name} STATIC ${${lib_name}_libsrcs})
 target_include_directories(${lib_name} PUBLIC $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
   $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
   )
-target_link_libraries(${lib_name} PRIVATE ${EXPAT_LIBRARIES} ${OPENSSL_LIBRARIES} ${SYS_LIBS})
+target_link_libraries(${lib_name} PRIVATE ${LIBEXPAT_LIBRARIES} ${OPENSSL_LIBRARIES} ${SYS_LIBS})
 set_target_properties(${lib_name} PROPERTIES
   PREFIX "" # strip off the "lib" prefix, since it's already libstrophe
   )