diff --git a/.github/workflows/build-and-publish-vanilla-zephyr.yaml b/.github/workflows/build-and-publish-vanilla-zephyr.yaml
index d7eaf64..348c35f 100644
--- a/.github/workflows/build-and-publish-vanilla-zephyr.yaml
+++ b/.github/workflows/build-and-publish-vanilla-zephyr.yaml
@@ -25,7 +25,14 @@ jobs:
       matrix:
         variant:
           - zephyr_version: "v3.6.0"
+            zephyr_sdk_version: "0.16.8"
             mcuboot_version: "a4eda30f5b0cfd0cf15512be9dcd559239dbfc91"
+          - zephyr_version: "v3.7.1"
+            zephyr_sdk_version: "0.16.9"
+            mcuboot_version: "ea2410697dd0262edec041a0ccb07fdbde7c1aff"
+          - zephyr_version: "v4.0.0"
+            zephyr_sdk_version: "0.17.0"
+            mcuboot_version: "f74b77cf7808919837c0ed14c2ead3918c546349"
 
     steps:
       - name: Checkout repository
@@ -54,6 +61,7 @@ jobs:
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-${{ matrix.variant.zephyr_version }}-ci:latest
           build-args: |
             ZEPHYR_VERSION=${{ matrix.variant.zephyr_version }}
+            ZEPHYR_SDK_VERSION=${{ matrix.variant.zephyr_sdk_version }}
             MCUBOOT_VERSION=${{ matrix.variant.mcuboot_version }}
 
       - name: Build and push Dev image
@@ -68,5 +76,6 @@ jobs:
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-${{ matrix.variant.zephyr_version }}-dev:latest
           build-args: |
             ZEPHYR_VERSION=${{ matrix.variant.zephyr_version }}
+            ZEPHYR_SDK_VERSION=${{ matrix.variant.zephyr_sdk_version }}
             MCUBOOT_VERSION=${{ matrix.variant.mcuboot_version }}
             BASE_IMAGE=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-${{ matrix.variant.zephyr_version }}-ci:${{ inputs.release_version }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5b6b07d..87f0f73 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 ## [Unreleased]
 
+### Added
+
+- Add support for Zephyr v3.7.1 (LTS) and v4.0.0.
+
 ## [1.9.0] - 2024-11-20
 
 ### Added
diff --git a/vanilla-zephyr/build_ci.sh b/vanilla-zephyr/build_ci.sh
index d51d924..a407a23 100755
--- a/vanilla-zephyr/build_ci.sh
+++ b/vanilla-zephyr/build_ci.sh
@@ -1,9 +1,11 @@
 #! /usr/bin/env bash
-ZEPHYR_VERSION=v3.6.0
-MCUBOOT_VERSION=a4eda30f5b0cfd0cf15512be9dcd559239dbfc91
+ZEPHYR_VERSION=v3.7.1
+ZEPHYR_SDK_VERSION=0.16.9
+MCUBOOT_VERSION=ea2410697dd0262edec041a0ccb07fdbde7c1aff
 
 docker build \
     --build-arg "ZEPHYR_VERSION=$ZEPHYR_VERSION" \
+    --build-arg "ZEPHYR_SDK_VERSION=$ZEPHYR_SDK_VERSION" \
     --build-arg "MCUBOOT_VERSION=$MCUBOOT_VERSION" \
     -f "Dockerfile.ci" \
     -t "irnas/vanilla-zephyr-$ZEPHYR_VERSION-ci:latest" .
diff --git a/vanilla-zephyr/build_dev.sh b/vanilla-zephyr/build_dev.sh
index 373a10f..7783bd1 100755
--- a/vanilla-zephyr/build_dev.sh
+++ b/vanilla-zephyr/build_dev.sh
@@ -1,10 +1,12 @@
 #! /usr/bin/env bash
-ZEPHYR_VERSION=v3.6.0
-MCUBOOT_VERSION=a4eda30f5b0cfd0cf15512be9dcd559239dbfc91
+ZEPHYR_VERSION=v3.7.1
+ZEPHYR_SDK_VERSION=0.16.9
+MCUBOOT_VERSION=ea2410697dd0262edec041a0ccb07fdbde7c1aff
 BASE_IMAGE="irnas/vanilla-zephyr-$ZEPHYR_VERSION-ci:latest"
 
 docker build \
     --build-arg "ZEPHYR_VERSION=$ZEPHYR_VERSION" \
+    --build-arg "ZEPHYR_SDK_VERSION=$ZEPHYR_SDK_VERSION" \
     --build-arg "MCUBOOT_VERSION=$MCUBOOT_VERSION" \
     --build-arg "BASE_IMAGE=$BASE_IMAGE" \
     -f "Dockerfile.dev" \