diff --git a/build_engine_mapping.json b/build_engine_mapping.json
index 2663e9c..1d1b564 100644
--- a/build_engine_mapping.json
+++ b/build_engine_mapping.json
@@ -1,4 +1,6 @@
 {
   "vs-15-2017-win64-cxx17" : "Visual Studio 15 2017 Win64",
-  "vs-16-2019-win64-cxx17" : "Visual Studio 16 2019"
+  "vs-16-2019-win64-cxx17" : "Visual Studio 16 2019",
+  "vs-17-2022-win64-cxx17" : "Visual Studio 17 2022"
+
 }
\ No newline at end of file
diff --git a/linux-custom-almalinux-95.cmake b/linux-custom-almalinux-95.cmake
new file mode 100644
index 0000000..e69de29
diff --git a/linux-custom-almalinux-95.cmake.layers.json b/linux-custom-almalinux-95.cmake.layers.json
new file mode 100644
index 0000000..58509eb
--- /dev/null
+++ b/linux-custom-almalinux-95.cmake.layers.json
@@ -0,0 +1,4 @@
+[
+  "!linux-*/**",
+  "linux-custom-almalinux-95*"
+]
\ No newline at end of file
diff --git a/linux-custom-almalinux-95.pkr.js/linux-custom-almalinux-95.Dockerfile b/linux-custom-almalinux-95.pkr.js/linux-custom-almalinux-95.Dockerfile
new file mode 100644
index 0000000..72fec18
--- /dev/null
+++ b/linux-custom-almalinux-95.pkr.js/linux-custom-almalinux-95.Dockerfile
@@ -0,0 +1,14 @@
+ARG ALMALINUX_9_5="almalinux@sha256:91387bd5b12c2626c9b01a8062e6dd02cdf3a9d4b9ba705631c01597f9e3ae06"
+FROM ${ALMALINUX_9_5}
+
+# Install tipi and cmake-re
+ENV TIPI_DISTRO_MODE=default
+ENV TIPI_INSTALL_LEGACY_PACKAGES=OFF
+ENV SUDO_GROUP=wheel
+ENV TIPI_INSTALL_SOURCE=file:///tipi-linux-x86_64.zip
+COPY /tipi-linux-x86_64.zip .
+RUN curl -fsSL https://raw.githubusercontent.com/tipi-build/cli/c14014db11342118f65ef95520a70f43c17ca453/install/container/centos.sh -o centos.sh && /bin/bash centos.sh
+
+USER tipi
+WORKDIR /home/tipi
+EXPOSE 22
\ No newline at end of file
diff --git a/linux-custom-almalinux-95.pkr.js/linux-custom-almalinux-95.pkr.js b/linux-custom-almalinux-95.pkr.js/linux-custom-almalinux-95.pkr.js
new file mode 100644
index 0000000..faef36a
--- /dev/null
+++ b/linux-custom-almalinux-95.pkr.js/linux-custom-almalinux-95.pkr.js
@@ -0,0 +1,17 @@
+{
+  "variables": { },
+  "builders": [
+    {
+      "type": "docker",
+      "image": "linux-custom-almalinux-95:{{cmake_re_source_hash}}",
+      "commit": true
+    }
+  ],
+  "post-processors": [
+    { 
+      "type": "docker-tag",
+      "repository": "linux",
+      "tag": "latest"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/linux-custom.cmake b/linux-custom.cmake
new file mode 100644
index 0000000..e69de29
diff --git a/linux-custom.cmake.layers.json b/linux-custom.cmake.layers.json
new file mode 100644
index 0000000..00c30ec
--- /dev/null
+++ b/linux-custom.cmake.layers.json
@@ -0,0 +1,4 @@
+[
+  "!linux-*/**",
+  "linux-custom*"
+]
\ No newline at end of file
diff --git a/linux-custom.pkr.js/linux-custom.Dockerfile b/linux-custom.pkr.js/linux-custom.Dockerfile
new file mode 100644
index 0000000..a72c3b1
--- /dev/null
+++ b/linux-custom.pkr.js/linux-custom.Dockerfile
@@ -0,0 +1,16 @@
+ARG UBUNTU_24_04="ubuntu@sha256:04f510bf1f2528604dc2ff46b517dbdbb85c262d62eacc4aa4d3629783036096"
+FROM ${UBUNTU_24_04}
+
+ENV TIPI_DISTRO_MODE=default
+ENV TIPI_INSTALL_LEGACY_PACKAGES=OFF
+ENV TIPI_INSTALL_SOURCE=file:///tipi-linux-x86_64.zip
+COPY /tipi-linux-x86_64.zip .
+
+ARG DEBIAN_FRONTEND=noninteractive # avoid tzdata asking for configuration
+# Install tipi and cmake-re
+RUN apt update -y && apt install -y curl gettext
+RUN curl -fsSL https://raw.githubusercontent.com/tipi-build/cli/c14014db11342118f65ef95520a70f43c17ca453/install/container/ubuntu.sh -o ubuntu.sh && /bin/bash ubuntu.sh
+USER tipi
+WORKDIR /home/tipi
+EXPOSE 22
+
diff --git a/linux-custom.pkr.js/linux-custom.pkr.js b/linux-custom.pkr.js/linux-custom.pkr.js
new file mode 100644
index 0000000..57918e8
--- /dev/null
+++ b/linux-custom.pkr.js/linux-custom.pkr.js
@@ -0,0 +1,18 @@
+{
+  "variables": { },
+  "builders": [
+    {
+      "type": "docker",
+      "image": "linux-custom:{{cmake_re_source_hash}}",
+      "commit": true
+    }
+  ],
+  "post-processors": [
+    { 
+      "type": "docker-tag",
+      "repository": "linux",
+      "tag": "latest"
+    }
+  ]
+
+}
\ No newline at end of file
diff --git a/linux-ubuntu-2404.cmake b/linux-ubuntu-2404.cmake
index e69de29..5d073aa 100644
--- a/linux-ubuntu-2404.cmake
+++ b/linux-ubuntu-2404.cmake
@@ -0,0 +1 @@
+include("${CMAKE_CURRENT_LIST_DIR}/linux-cxx17.cmake")
\ No newline at end of file
diff --git a/linux-ubuntu-2404.pkr.js/linux-ubuntu-2404.Dockerfile b/linux-ubuntu-2404.pkr.js/linux-ubuntu-2404.Dockerfile
index a72c3b1..014ad79 100644
--- a/linux-ubuntu-2404.pkr.js/linux-ubuntu-2404.Dockerfile
+++ b/linux-ubuntu-2404.pkr.js/linux-ubuntu-2404.Dockerfile
@@ -1,14 +1,14 @@
 ARG UBUNTU_24_04="ubuntu@sha256:04f510bf1f2528604dc2ff46b517dbdbb85c262d62eacc4aa4d3629783036096"
 FROM ${UBUNTU_24_04}
 
-ENV TIPI_DISTRO_MODE=default
+ENV TIPI_DISTRO_MODE=all
 ENV TIPI_INSTALL_LEGACY_PACKAGES=OFF
 ENV TIPI_INSTALL_SOURCE=file:///tipi-linux-x86_64.zip
 COPY /tipi-linux-x86_64.zip .
 
 ARG DEBIAN_FRONTEND=noninteractive # avoid tzdata asking for configuration
 # Install tipi and cmake-re
-RUN apt update -y && apt install -y curl gettext
+RUN apt update -y && apt install -y curl gettext build-essential
 RUN curl -fsSL https://raw.githubusercontent.com/tipi-build/cli/c14014db11342118f65ef95520a70f43c17ca453/install/container/ubuntu.sh -o ubuntu.sh && /bin/bash ubuntu.sh
 USER tipi
 WORKDIR /home/tipi
diff --git a/vs-17-2022-win64-cxx17.cmake b/vs-17-2022-win64-cxx17.cmake
new file mode 100644
index 0000000..fb35c89
--- /dev/null
+++ b/vs-17-2022-win64-cxx17.cmake
@@ -0,0 +1,29 @@
+# Copyright (c) 2015-2017, Ruslan Baratov
+# All rights reserved.
+
+if(DEFINED POLLY_VS_17_2022_WIN64_CXX17_CMAKE_)
+  return()
+else()
+  set(POLLY_VS_17_2022_WIN64_CXX17_CMAKE_ 1)
+endif()
+
+include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_init.cmake")
+
+polly_init(
+    "Visual Studio 17 2022 Win64 / C++17"
+    "Visual Studio 17 2022"
+)
+
+include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_common.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/flags/vs-cxx17.cmake")
+
+add_compile_definitions(
+    NOMINMAX
+    WIN32_LEAN_AND_MEAN
+    _WIN32_WINNT=0x0A00 # We have to set the windows version targeted
+    WINVER=0x0A00 # We have to set the windows version targeted
+    LYRA_CONFIG_OPTIONAL_TYPE=std::optional
+
+)
+
+set (CMAKE_SYSTEM_VERSION "10.0.22621.0" CACHE STRING "Ensure WinSDK is recent enough to compile in C++17" FORCE )