diff --git a/.devcontainer b/.devcontainer
index 8e3a095..de12dc2 160000
--- a/.devcontainer
+++ b/.devcontainer
@@ -1 +1 @@
-Subproject commit 8e3a09572bb23136a6fdbbd80cfcc6e2947b081c
+Subproject commit de12dc208298d0090a6e9efadf9eafd6018a549c
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 0000000..3b34b65
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,25 @@
+name: Build
+on:
+  push:
+    branches: [ "dev" ]
+  pull_request:
+    branches: [ "dev" ]
+  workflow_dispatch:
+jobs:
+  linux:
+    uses: externpro/externpro/.github/workflows/build-linux.yml@25.04
+    with:
+      cmake-workflow-preset: LinuxRelease
+      runon: ubuntu-latest
+    secrets: inherit
+  linux-arm64:
+    uses: externpro/externpro/.github/workflows/build-linux.yml@25.04
+    with:
+      cmake-workflow-preset: LinuxRelease
+      runon: ubuntu-24.04-arm
+    secrets: inherit
+  windows:
+    uses: externpro/externpro/.github/workflows/build-windows.yml@25.04
+    with:
+      cmake-workflow-preset: WindowsRelease
+    secrets: inherit
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 0000000..6fa033b
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,16 @@
+name: Release
+on:
+  workflow_dispatch:
+    inputs:
+      workflow_run_url:
+        description: 'URL of the workflow run containing artifacts to upload (e.g., https://github.com/owner/repo/actions/runs/123456789)'
+        required: true
+        type: string
+jobs:
+  # Upload build artifacts as release assets
+  release-from-build:
+    uses: externpro/externpro/.github/workflows/release-from-build.yml@25.04
+    with:
+      workflow_run_url: ${{ github.event.inputs.workflow_run_url }}
+      artifact_pattern: "*.tar.xz"
+    secrets: inherit
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 95e94a8..b023663 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,8 +1,7 @@
-cmake_minimum_required(VERSION 3.28)
+cmake_minimum_required(VERSION 3.31)
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/.devcontainer/cmake)
 include(preproject)
 project(patch VERSION 2.7)
-set(buildpro_REV 24.03)
 include(flags)
 include(GNUInstallDirs)
 set(XP_INSTALL_CMAKEDIR ${CMAKE_INSTALL_DATADIR}/cmake)
@@ -12,8 +11,8 @@ if(WIN32 AND NOT UNIX)
   set(VER 2.7.6)
   ExternalProject_Add(${PROJECT_NAME}
     DOWNLOAD_EXTRACT_TIMESTAMP true
-    URL https://github.com/smanders/externpro/releases/download/20.10.1/patch-${VER}-bin.zip
-    URL_MD5 e0d4690179d85c1cf543f52856a63db9
+    URL https://github.com/externpro/patch/releases/download/v2.7/patch-${VER}-bin.zip
+    URL_HASH SHA256=eb848c8b0a51f51ed9407b832a975f1d47578825c7e7c3f23e79f23e88b9693b
     CONFIGURE_COMMAND ${CMAKE_COMMAND} -E copy_if_different
       <SOURCE_DIR>/patch.exe <INSTALL_DIR>/bin/patcz.exe
     BUILD_COMMAND ${CMAKE_COMMAND} -E copy_if_different
diff --git a/CMakePresets.json b/CMakePresets.json
index 08d18a9..5a06690 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -1,7 +1,7 @@
 {
   "version": 8,
   "include": [
-    ".devcontainer/cmake/presets/xpLinuxNinjaRelease.json",
-    ".devcontainer/cmake/presets/xpWindowsVs2019Release.json"
+    ".devcontainer/cmake/presets/xpLinuxNinja.json",
+    ".devcontainer/cmake/presets/xpWindowsVs2022.json"
   ]
 }
diff --git a/docker-compose.sh b/docker-compose.sh
index 57f36db..85f182f 120000
--- a/docker-compose.sh
+++ b/docker-compose.sh
@@ -1 +1 @@
-.devcontainer/compose.bld.sh
\ No newline at end of file
+.devcontainer/compose.pro.sh
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 7e6cc2e..46c1f89 120000
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1 +1 @@
-.devcontainer/compose.pro.yml
\ No newline at end of file
+.devcontainer/compose.bld.yml
\ No newline at end of file