diff --git a/packages/atlas-core/CHANGELOG.md b/packages/atlas-core/CHANGELOG.md
index 558c2c7d2..8d8dd3bb6 100644
--- a/packages/atlas-core/CHANGELOG.md
+++ b/packages/atlas-core/CHANGELOG.md
@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+## [3.16.0] Atlas Core - 2024-11-8
+
+### Changed
+
+-   We update atlas-core minimum version to SP 10.12.6.
+
 ## [3.15.0] Atlas Core - 2024-11-4
 
 ### Fixed
diff --git a/packages/atlas-core/package.json b/packages/atlas-core/package.json
index 85e9d5392..5e3c19869 100644
--- a/packages/atlas-core/package.json
+++ b/packages/atlas-core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "atlas-core",
   "moduleName": "Atlas Core",
-  "version": "3.15.0",
+  "version": "3.16.0",
   "license": "Apache-2.0",
   "copyright": "© Mendix Technology BV 2024. All rights reserved.",
   "repository": {
@@ -9,13 +9,13 @@
     "url": "https://github.com/mendix/atlas.git"
   },
   "marketplace": {
-    "minimumMXVersion": "10.6.0.23934",
+    "minimumMXVersion": "10.12.6.46815",
     "marketplaceId": 117187
   },
   "testProject": {
     "githubUrl": "https://github.com/mendix/Atlas-Design-System",
-    "branchName": "lts/9.24",
-    "mxVersion": "10.5.0.21627"
+    "branchName": "mts/10.12",
+    "mxVersion": "10.12.6.46815"
   },
   "scripts": {
     "build:module": "ts-node ./scripts/build.ts build",
diff --git a/packages/atlas-web-content/CHANGELOG.md b/packages/atlas-web-content/CHANGELOG.md
index 09362a47b..4727fe66a 100644
--- a/packages/atlas-web-content/CHANGELOG.md
+++ b/packages/atlas-web-content/CHANGELOG.md
@@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ### Changed
 
 -   We update Pageheader_WithSearch building block to use combobox instead of Dropdown to support modern client.
+-   We updated Atlas Web Content minimum version to SP 10.12.6.
 
 ## [3.6.0] Atlas Web Content - 2024-6-11
 
diff --git a/packages/atlas-web-content/package.json b/packages/atlas-web-content/package.json
index 698d4723f..6b5a131ed 100644
--- a/packages/atlas-web-content/package.json
+++ b/packages/atlas-web-content/package.json
@@ -1,7 +1,7 @@
 {
   "name": "atlas-web-content",
   "moduleName": "Atlas Web Content",
-  "version": "3.6.1",
+  "version": "3.7.0",
   "license": "Apache-2.0",
   "copyright": "© Mendix Technology BV 2024. All rights reserved.",
   "repository": {
@@ -9,13 +9,13 @@
     "url": "https://github.com/mendix/atlas.git"
   },
   "marketplace": {
-    "minimumMXVersion": "10.6.0.23934",
+    "minimumMXVersion": "10.12.6.46815",
     "marketplaceId": 117183
   },
   "testProject": {
     "githubUrl": "https://github.com/mendix/Atlas-Design-System",
-    "branchName": "lts/9.24",
-    "mxVersion": "10.5.0.21627"
+    "branchName": "mts/10.12",
+    "mxVersion": "10.12.6.46815"
   },
   "scripts": {
     "build:module": "ts-node ./scripts/build.ts build",
diff --git a/packages/atlas/scripts/e2e.playwright.js b/packages/atlas/scripts/e2e.playwright.js
index 7900ce93a..fbc8780d9 100644
--- a/packages/atlas/scripts/e2e.playwright.js
+++ b/packages/atlas/scripts/e2e.playwright.js
@@ -55,7 +55,7 @@ async function main() {
     if (!existingImages) {
         console.log(`Creating new mxbuild docker image...`);
         execSync(
-            `docker build --platform=linux/amd64 -f ${join(__dirname, "mxbuild.Dockerfile")} ` +
+            `docker build -f ${join(__dirname, "mxbuild.Dockerfile")} ` +
                 `--build-arg MENDIX_VERSION=${mendixVersion} ` +
                 `-t mxbuild:${mendixVersion} ${__dirname}`,
             { stdio: "inherit" }
@@ -66,7 +66,7 @@ async function main() {
     if (!existingRuntimeImages) {
         console.log(`Creating new runtime docker image...`);
         execSync(
-            `docker build --platform=linux/amd64 -f ${join(__dirname, "runtime.Dockerfile")} ` +
+            `docker build -f ${join(__dirname, "runtime.Dockerfile")} ` +
                 `--build-arg MENDIX_VERSION=${mendixVersion} ` +
                 `-t mxruntime:${mendixVersion} ${__dirname}`,
             { stdio: "inherit" }
diff --git a/packages/atlas/scripts/mxbuild.Dockerfile b/packages/atlas/scripts/mxbuild.Dockerfile
index bb1d2cb6d..e1de64c9d 100644
--- a/packages/atlas/scripts/mxbuild.Dockerfile
+++ b/packages/atlas/scripts/mxbuild.Dockerfile
@@ -1,28 +1,37 @@
-FROM mcr.microsoft.com/dotnet/runtime:6.0
+FROM --platform=$BUILDPLATFORM eclipse-temurin:17-jdk-jammy
 ARG MENDIX_VERSION
+ARG BUILDPLATFORM
 
+SHELL ["/bin/bash", "-c"]
 RUN \
-    echo "Installing Java..." && \
-    apt-get -qq update && \
-    apt-get -qq install -y wget libgdiplus && \
-    wget -q https://download.java.net/java/GA/jdk11/9/GPL/openjdk-11.0.2_linux-x64_bin.tar.gz -O /tmp/openjdk.tar.gz && \
-    mkdir /usr/lib/jvm && \
-    tar xfz /tmp/openjdk.tar.gz --directory /usr/lib/jvm && \
-    rm /tmp/openjdk.tar.gz && \
+echo "Downloading mxbuild ${MENDIX_VERSION} and docker building for ${BUILDPLATFORM}..." \
+    && case "${BUILDPLATFORM}" in \
+        linux/arm64) \
+            BINARY_URL="https://cdn.mendix.com/runtime/arm64-mxbuild-${MENDIX_VERSION}.tar.gz"; \
+            ;; \
+        linux/amd64) \
+            BINARY_URL="https://cdn.mendix.com/runtime/mxbuild-${MENDIX_VERSION}.tar.gz"; \
+            ;; \
+        *) \
+            echo "Unsupported architecture: ${BUILDPLATFORM}" >&2; \
+            exit 1; \
+            ;; \
+    esac \
+    && echo "Downloading from: ${BINARY_URL}" \
+    && wget -q "${BINARY_URL}" -O /tmp/mxbuild.tar.gz \
+    && mkdir /tmp/mxbuild \
+    && tar xfz /tmp/mxbuild.tar.gz --directory /tmp/mxbuild \
+    && rm /tmp/mxbuild.tar.gz && \
 \
-    echo "Downloading mxbuild ${MENDIX_VERSION}..." && \
-    wget -q https://cdn.mendix.com/runtime/mxbuild-${MENDIX_VERSION}.tar.gz -O /tmp/mxbuild.tar.gz && \
-    mkdir /tmp/mxbuild && \
-    tar xfz /tmp/mxbuild.tar.gz --directory /tmp/mxbuild && \
-    rm /tmp/mxbuild.tar.gz && \
-\
-    apt-get -qq remove -y wget && \
+    apt-get update -qqy && \
+    apt-get install -qqy libicu70 && \
+    apt-get -qqy remove --auto-remove wget && \
     apt-get clean && \
 \
     echo "#!/bin/bash -x" >/bin/mxbuild && \
-    echo "dotnet /tmp/mxbuild/modeler/mxbuild.dll --java-home=/usr/lib/jvm/jdk-11.0.2 --java-exe-path=/usr/lib/jvm/jdk-11.0.2/bin/java \$@" >>/bin/mxbuild && \
+    echo "/tmp/mxbuild/modeler/mxbuild --java-home=/opt/java/openjdk --java-exe-path=/opt/java/openjdk/bin/java \$@" >>/bin/mxbuild && \
     chmod +x /bin/mxbuild && \
 \
     echo "#!/bin/bash -x" >/bin/mx && \
-    echo "dotnet /tmp/mxbuild/modeler/mx.dll \$@" >>/bin/mx && \
-    chmod +x /bin/mx
+    echo "/tmp/mxbuild/modeler/mx \$@" >>/bin/mx && \
+    chmod +x /bin/mx
\ No newline at end of file
diff --git a/packages/atlas/scripts/runtime.Dockerfile b/packages/atlas/scripts/runtime.Dockerfile
index 72e0d2a73..8092995fa 100644
--- a/packages/atlas/scripts/runtime.Dockerfile
+++ b/packages/atlas/scripts/runtime.Dockerfile
@@ -1,4 +1,4 @@
-FROM adoptopenjdk/openjdk11:jdk-11.0.19_7-slim
+FROM eclipse-temurin:17-jdk-jammy
 
 ARG MENDIX_VERSION
 
diff --git a/scripts/mxbuild.Dockerfile b/scripts/mxbuild.Dockerfile
index bb1d2cb6d..9c65d3f6c 100644
--- a/scripts/mxbuild.Dockerfile
+++ b/scripts/mxbuild.Dockerfile
@@ -1,28 +1,37 @@
-FROM mcr.microsoft.com/dotnet/runtime:6.0
+FROM --platform=$BUILDPLATFORM eclipse-temurin:17-jdk-jammy
 ARG MENDIX_VERSION
+ARG BUILDPLATFORM
 
+SHELL ["/bin/bash", "-c"]
 RUN \
-    echo "Installing Java..." && \
-    apt-get -qq update && \
-    apt-get -qq install -y wget libgdiplus && \
-    wget -q https://download.java.net/java/GA/jdk11/9/GPL/openjdk-11.0.2_linux-x64_bin.tar.gz -O /tmp/openjdk.tar.gz && \
-    mkdir /usr/lib/jvm && \
-    tar xfz /tmp/openjdk.tar.gz --directory /usr/lib/jvm && \
-    rm /tmp/openjdk.tar.gz && \
+echo "Downloading mxbuild ${MENDIX_VERSION} and docker building for ${BUILDPLATFORM}..." \
+    && case "${BUILDPLATFORM}" in \
+        linux/arm64) \
+            BINARY_URL="https://cdn.mendix.com/runtime/arm64-mxbuild-${MENDIX_VERSION}.tar.gz"; \
+            ;; \
+        linux/amd64) \
+            BINARY_URL="https://cdn.mendix.com/runtime/mxbuild-${MENDIX_VERSION}.tar.gz"; \
+            ;; \
+        *) \
+            echo "Unsupported architecture: ${BUILDPLATFORM}" >&2; \
+            exit 1; \
+            ;; \
+    esac \
+    && echo "Downloading from: ${BINARY_URL}" \
+    && wget -q "${BINARY_URL}" -O /tmp/mxbuild.tar.gz \
+    && mkdir /tmp/mxbuild \
+    && tar xfz /tmp/mxbuild.tar.gz --directory /tmp/mxbuild \
+    && rm /tmp/mxbuild.tar.gz && \
 \
-    echo "Downloading mxbuild ${MENDIX_VERSION}..." && \
-    wget -q https://cdn.mendix.com/runtime/mxbuild-${MENDIX_VERSION}.tar.gz -O /tmp/mxbuild.tar.gz && \
-    mkdir /tmp/mxbuild && \
-    tar xfz /tmp/mxbuild.tar.gz --directory /tmp/mxbuild && \
-    rm /tmp/mxbuild.tar.gz && \
-\
-    apt-get -qq remove -y wget && \
+    apt-get update -qqy && \
+    apt-get install -qqy libicu70 && \
+    apt-get -qqy remove --auto-remove wget && \
     apt-get clean && \
 \
     echo "#!/bin/bash -x" >/bin/mxbuild && \
-    echo "dotnet /tmp/mxbuild/modeler/mxbuild.dll --java-home=/usr/lib/jvm/jdk-11.0.2 --java-exe-path=/usr/lib/jvm/jdk-11.0.2/bin/java \$@" >>/bin/mxbuild && \
+    echo "/tmp/mxbuild/modeler/mxbuild --java-home=/opt/java/openjdk --java-exe-path=/opt/java/openjdk/bin/java \$@" >>/bin/mxbuild && \
     chmod +x /bin/mxbuild && \
 \
     echo "#!/bin/bash -x" >/bin/mx && \
-    echo "dotnet /tmp/mxbuild/modeler/mx.dll \$@" >>/bin/mx && \
+    echo "/tmp/mxbuild/modeler/mx \$@" >>/bin/mx && \
     chmod +x /bin/mx