diff --git a/.devcontainer/All/Dockerfile.All b/.devcontainer/All/Dockerfile.All
index 8d5bb6df95..a03355d00f 100644
--- a/.devcontainer/All/Dockerfile.All
+++ b/.devcontainer/All/Dockerfile.All
@@ -1 +1 @@
-FROM ghcr.io/nanoframework/dev-container-all:v2.50
+FROM ghcr.io/nanoframework/dev-container-all:v2.51
diff --git a/.devcontainer/All/Dockerfile.All.SRC b/.devcontainer/All/Dockerfile.All.SRC
index c3afb634dc..90bacabed7 100644
--- a/.devcontainer/All/Dockerfile.All.SRC
+++ b/.devcontainer/All/Dockerfile.All.SRC
@@ -78,7 +78,7 @@ RUN git clone --branch v6.4.0_rel --recursive https://github.com/eclipse-threadx
     && git clone --branch v6.3.0_rel --recursive https://github.com/eclipse-threadx/netxduo.git --depth 1 ./sources/NetxDuo
 
 # Clone dependent repos (mbedtls, fatfs and littlefs)
-RUN git clone --branch mbedtls-3.5.2 https://github.com/ARMmbed/mbedtls.git --depth 1 ./sources/mbedtls \
+RUN git clone --branch mbedtls-3.6.0 https://github.com/ARMmbed/mbedtls.git --depth 1 ./sources/mbedtls \
     && git clone --branch R0.15 https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs \
     && git clone --branch v2.9.3 https://github.com/littlefs-project/littlefs --depth 1 ./sources/littlefs
 
diff --git a/.devcontainer/All/scripts/git-pull-repos.sh b/.devcontainer/All/scripts/git-pull-repos.sh
index 5645d49e10..6455e1660e 100644
--- a/.devcontainer/All/scripts/git-pull-repos.sh
+++ b/.devcontainer/All/scripts/git-pull-repos.sh
@@ -15,7 +15,7 @@ git svn clone http://svn.code.sf.net/p/chibios/code/branches/stable_21.11.x -rHE
 cd /sources/ChibiOs-Contrib
 git pull origin chibios-21.11.x
 cd /sources/mbedtls
-git pull origin mbedtls-3.5.2
+git pull origin mbedtls-3.6.0
 cd /sources/fatfs
 git pull origin R0.15
 cd /sources/FreeRTOS
diff --git a/.devcontainer/AzureRTOS/Dockerfile.AzureRTOS b/.devcontainer/AzureRTOS/Dockerfile.AzureRTOS
index 8ba64c629c..2939351e4f 100644
--- a/.devcontainer/AzureRTOS/Dockerfile.AzureRTOS
+++ b/.devcontainer/AzureRTOS/Dockerfile.AzureRTOS
@@ -1 +1 @@
-FROM ghcr.io/nanoframework/dev-container-azure-rtos:v1.28
+FROM ghcr.io/nanoframework/dev-container-azure-rtos:v1.29
diff --git a/.devcontainer/AzureRTOS/Dockerfile.AzureRTOS.SRC b/.devcontainer/AzureRTOS/Dockerfile.AzureRTOS.SRC
index 881daa3467..8f36238837 100644
--- a/.devcontainer/AzureRTOS/Dockerfile.AzureRTOS.SRC
+++ b/.devcontainer/AzureRTOS/Dockerfile.AzureRTOS.SRC
@@ -67,7 +67,7 @@ RUN git clone --branch v6.4.0_rel --recursive https://github.com/eclipse-threadx
     && git clone --branch v6.4.0_rel --recursive https://github.com/eclipse-threadx/netxduo.git --depth 1 ./sources/NetxDuo
 
 # Clone dependent repos (mbedtls, fatfs and littlefs)
-RUN git clone --branch mbedtls-3.5.2 https://github.com/ARMmbed/mbedtls.git --depth 1 ./sources/mbedtls \
+RUN git clone --branch mbedtls-3.6.0 https://github.com/ARMmbed/mbedtls.git --depth 1 ./sources/mbedtls \
     && git clone --branch R0.15 https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs \
     && git clone --branch v2.9.3 https://github.com/littlefs-project/littlefs --depth 1 ./sources/littlefs
 
diff --git a/.devcontainer/ChibiOS/Dockerfile.ChibiOS b/.devcontainer/ChibiOS/Dockerfile.ChibiOS
index 56fa1ea096..8cc13bab4a 100644
--- a/.devcontainer/ChibiOS/Dockerfile.ChibiOS
+++ b/.devcontainer/ChibiOS/Dockerfile.ChibiOS
@@ -1 +1 @@
-FROM ghcr.io/nanoframework/dev-container-chibios:v1.29
+FROM ghcr.io/nanoframework/dev-container-chibios:v1.30
diff --git a/.devcontainer/ChibiOS/Dockerfile.ChibiOS.SRC b/.devcontainer/ChibiOS/Dockerfile.ChibiOS.SRC
index b5f3e03dcd..82d777545c 100644
--- a/.devcontainer/ChibiOS/Dockerfile.ChibiOS.SRC
+++ b/.devcontainer/ChibiOS/Dockerfile.ChibiOS.SRC
@@ -65,7 +65,7 @@ RUN git clone --branch nf-build https://github.com/nanoframework/STM32CubeL4.git
     && git clone --branch chibios-21.11.x https://github.com/ChibiOS/ChibiOS-Contrib.git --depth 1 ./sources/ChibiOs-Contrib
 
 # Clone dependent repos (mbedtls, fatfs and littlefs etc.)
-RUN git clone --branch mbedtls-3.5.2 https://github.com/ARMmbed/mbedtls.git --depth 1 ./sources/mbedtls \
+RUN git clone --branch mbedtls-3.6.0 https://github.com/ARMmbed/mbedtls.git --depth 1 ./sources/mbedtls \
     && git clone --branch R0.15 https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs \
     && git clone --branch v2.9.3 https://github.com/littlefs-project/littlefs --depth 1 ./sources/littlefs \
     && git clone --branch STABLE-2_1_3_RELEASE https://github.com/lwip-tcpip/lwip.git --depth 1 ./sources/lwip
diff --git a/.devcontainer/FreeRTOS-NXP/Dockerfile.FreeRTOS-NXP b/.devcontainer/FreeRTOS-NXP/Dockerfile.FreeRTOS-NXP
index 6389087fb1..6d7262c824 100644
--- a/.devcontainer/FreeRTOS-NXP/Dockerfile.FreeRTOS-NXP
+++ b/.devcontainer/FreeRTOS-NXP/Dockerfile.FreeRTOS-NXP
@@ -1 +1 @@
-FROM ghcr.io/nanoframework/dev-container-freertos-nxp:v1.02
+FROM ghcr.io/nanoframework/dev-container-freertos-nxp:v1.01
diff --git a/.devcontainer/FreeRTOS-NXP/Dockerfile.FreeRTOS-NXP.SRC b/.devcontainer/FreeRTOS-NXP/Dockerfile.FreeRTOS-NXP.SRC
index da9053fddc..c68c4a065f 100644
--- a/.devcontainer/FreeRTOS-NXP/Dockerfile.FreeRTOS-NXP.SRC
+++ b/.devcontainer/FreeRTOS-NXP/Dockerfile.FreeRTOS-NXP.SRC
@@ -55,7 +55,7 @@ RUN apt-get update \
 RUN mkdir -p /usr/local/bin/gcc
 
 # Clone libs mbedtls and fatfs etc.
-RUN git clone --branch mbedtls-3.5.2 https://github.com/ARMmbed/mbedtls.git --depth 1 ./sources/mbedtls \
+RUN git clone --branch mbedtls-3.6.0 https://github.com/ARMmbed/mbedtls.git --depth 1 ./sources/mbedtls \
     && git clone --branch R0.15 https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs \
     && git clone --branch STABLE-2_1_3_RELEASE https://github.com/lwip-tcpip/lwip.git --depth 1 ./sources/lwip
     
diff --git a/CMake/binutils.common.cmake b/CMake/binutils.common.cmake
index 8c89c57e64..b19afaf76d 100644
--- a/CMake/binutils.common.cmake
+++ b/CMake/binutils.common.cmake
@@ -753,7 +753,7 @@ function(nf_add_mbedtls_library)
 
     # set tag for currently supported version
     # WHEN CHANGING THIS MAKE SURE TO UPDATE THE DEV CONTAINERS
-    set(MBEDTLS_GIT_TAG "mbedtls-3.5.2")
+    set(MBEDTLS_GIT_TAG "mbedtls-3.6.0")
 
     # set options for Mbed TLS
     option(ENABLE_TESTING "no testing when building Mbed TLS." OFF)
diff --git a/src/PAL/COM/sockets/ssl/MbedTLS/ssl_generic.cpp b/src/PAL/COM/sockets/ssl/MbedTLS/ssl_generic.cpp
index e050fd892d..f2db6f340f 100644
--- a/src/PAL/COM/sockets/ssl/MbedTLS/ssl_generic.cpp
+++ b/src/PAL/COM/sockets/ssl/MbedTLS/ssl_generic.cpp
@@ -210,3 +210,9 @@ time_t nf_get_unix_epoch()
 
     return mktime(&time);
 }
+
+mbedtls_ms_time_t mbedtls_ms_time(void)
+{
+    // convert to milliseconds
+    return nf_get_unix_epoch() * 1000;
+}