diff --git a/.github/workflows/osrm-backend.yml b/.github/workflows/osrm-backend.yml
index abbe092459f..b43a40a7d99 100644
--- a/.github/workflows/osrm-backend.yml
+++ b/.github/workflows/osrm-backend.yml
@@ -446,14 +446,14 @@ jobs:
       if: steps.cache-boost.outputs.cache-hit != 'true' && runner.os == 'Linux' && matrix.ENABLE_CONAN != 'ON'
       run: |
         BOOST_VERSION="1.85.0"
-        BOOST_VERSION_UNDERSCORE="${BOOST_VERSION//./_}"
-        wget -q https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION}/source/boost_${BOOST_VERSION_UNDERSCORE}.tar.gz
-        tar xzf boost_${BOOST_VERSION_UNDERSCORE}.tar.gz
-        cd boost_${BOOST_VERSION_UNDERSCORE}
+        BOOST_VERSION_FLAVOR="${BOOST_VERSION}-b2-nodocs"
+        wget -q https://github.com/boostorg/boost/releases/download/boost-${BOOST_VERSION}/boost-${BOOST_VERSION_FLAVOR}.tar.gz
+        tar xzf boost-${BOOST_VERSION_FLAVOR}.tar.gz
+        cd boost-${BOOST_VERSION}
         sudo ./bootstrap.sh
         sudo ./b2 install
         cd ..
-        sudo rm -rf boost_${BOOST_VERSION_UNDERSCORE}*
+        sudo rm -rf boost-${BOOST_VERSION}*
     
     - name: Install dev dependencies
       run: |
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 08e0a64fa89..a8388b7db40 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,6 +56,9 @@ endif()
 if (POLICY CMP0074)
   cmake_policy(SET CMP0074 NEW)
 endif()
+if (POLICY CMP0167)
+  cmake_policy(SET CMP0167 NEW)
+endif()
 project(OSRM C CXX)
 
 
diff --git a/docker/Dockerfile-alpine b/docker/Dockerfile-alpine
index f6b14c21cd9..9e27655fbcd 100644
--- a/docker/Dockerfile-alpine
+++ b/docker/Dockerfile-alpine
@@ -1,6 +1,12 @@
-FROM alpine:3.20.5 AS alpine-mimalloc
+FROM alpine:3.21.2 AS alpine-mimalloc
 
-RUN apk add --no-cache mimalloc
+RUN apk update && \
+    apk upgrade && \
+    apk add --no-cache \
+        boost-iostreams \
+        boost-program_options \
+        boost-thread \
+        mimalloc
 
 ENV LD_PRELOAD=/usr/lib/libmimalloc.so.2
 ENV MIMALLOC_LARGE_OS_PAGES=1
@@ -14,9 +20,6 @@ RUN mkdir -p /src /opt && \
     apk add --no-cache \
     boost-dev \
     boost-filesystem \
-    boost-iostreams \
-    boost-program_options \
-    boost-thread \
     clang \
     cmake \
     expat-dev \
@@ -59,9 +62,6 @@ COPY --from=builder /opt /opt
 
 RUN apk add --no-cache \
     boost-date_time \
-    boost-iostreams \
-    boost-program_options \
-    boost-thread \
     expat \
     lua5.4 \
     onetbb && \
diff --git a/third_party/sol2/include/sol/sol.hpp b/third_party/sol2/include/sol/sol.hpp
index d7da763f735..d5070c90b52 100644
--- a/third_party/sol2/include/sol/sol.hpp
+++ b/third_party/sol2/include/sol/sol.hpp
@@ -6752,7 +6752,8 @@ namespace sol {
 			static_assert(std::is_constructible<T, Args&&...>::value, "T must be constructible with Args");
 
 			*this = nullopt;
-			this->construct(std::forward<Args>(args)...);
+			new (static_cast<void*>(this)) optional(std::in_place, std::forward<Args>(args)...);
+			return **this;
 		}
 
 		/// Swaps this optional with the other.