diff --git a/ports/jasper/check-for-atomics-support.patch b/ports/jasper/check-for-atomics-support.patch
new file mode 100644
index 0000000000..132d07f894
--- /dev/null
+++ b/ports/jasper/check-for-atomics-support.patch
@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8d2e9f9..110c245 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -591,6 +591,7 @@ set(JAS_HAVE_WIN32_THREADS FALSE)
+ if(JAS_ENABLE_MULTITHREADING_SUPPORT)
+ 	check_c_source_compiles("
+ 	#include <threads.h>
++	#include <stdatomic.h>
+ 	int main() {
+ 		thrd_t thread;
+ 		mtx_t mutex;
diff --git a/ports/jasper/portfile.cmake b/ports/jasper/portfile.cmake
index 52b7354436..e89a176201 100644
--- a/ports/jasper/portfile.cmake
+++ b/ports/jasper/portfile.cmake
@@ -7,6 +7,7 @@ vcpkg_from_github(
     PATCHES
         no_stdc_check.patch
         fix-library-name.patch
+        check-for-atomics-support.patch # https://github.com/jasper-software/jasper/pull/370
 )
 
 if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
diff --git a/ports/jasper/vcpkg.json b/ports/jasper/vcpkg.json
index 369b7e6e67..fbc9e9cf08 100644
--- a/ports/jasper/vcpkg.json
+++ b/ports/jasper/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "jasper",
   "version": "4.1.0",
+  "port-version": 1,
   "description": "Open source implementation of the JPEG-2000 Part-1 standard",
   "homepage": "https://github.com/jasper-software/jasper",
   "license": null,
diff --git a/ports/portable-snippets/CMakeLists.txt b/ports/portable-snippets/CMakeLists.txt
index 5f511265ad..0931363ce9 100644
--- a/ports/portable-snippets/CMakeLists.txt
+++ b/ports/portable-snippets/CMakeLists.txt
@@ -62,6 +62,10 @@ foreach (subdir ${subdirs})
     else ()
         add_library(${module} STATIC ${entries})
 
+        if (MSVC)
+            target_compile_definitions(${module} PUBLIC __STDC_NO_THREADS__=1)
+        endif ()
+
         set_target_properties(
             ${module}
             PROPERTIES
diff --git a/ports/portable-snippets/vcpkg.json b/ports/portable-snippets/vcpkg.json
index b1f66080fd..efcb6e5338 100644
--- a/ports/portable-snippets/vcpkg.json
+++ b/ports/portable-snippets/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "portable-snippets",
   "version-date": "2019-09-20",
-  "port-version": 3,
+  "port-version": 4,
   "description": "Collection of miscellaneous portable C snippets",
   "homepage": "https://github.com/nemequ/portable-snippets",
   "license": null,
diff --git a/scripts/azure-pipelines/android/Dockerfile b/scripts/azure-pipelines/android/Dockerfile
index 0e51a8bf63..e089221281 100644
--- a/scripts/azure-pipelines/android/Dockerfile
+++ b/scripts/azure-pipelines/android/Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1.4
-FROM ubuntu:20.04
+FROM ubuntu:focal-20231211
 
 ADD https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb /packages-microsoft-prod.deb
 ADD https://dl.google.com/android/repository/android-ndk-r25c-linux.zip /android-ndk-r25c-linux.zip
diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml
index 1a826aa5d5..263a05c94f 100644
--- a/scripts/azure-pipelines/azure-pipelines.yml
+++ b/scripts/azure-pipelines/azure-pipelines.yml
@@ -4,9 +4,9 @@
 variables:
   android-pool: 'PrAnd-1ES-Pool'
   linux-pool: 'PrLin-1ES-Pool'
-  windows-pool: 'PrWin-2023-12-12'
+  windows-pool: 'PrWin-2024-01-11'
   osx-pool: 'PrOsx-2023-09-11'
-  linux-docker-image: 'andcontainerregistry.azurecr.io/vcpkg-android:2023-12-05'
+  linux-docker-image: 'andcontainerregistry.azurecr.io/vcpkg-android:2024-01-11'
 
 parameters:
   - name: vcpkgToolSha
diff --git a/scripts/azure-pipelines/windows/deploy-pwsh.ps1 b/scripts/azure-pipelines/windows/deploy-pwsh.ps1
index 298fe59ffa..2bb6d25971 100644
--- a/scripts/azure-pipelines/windows/deploy-pwsh.ps1
+++ b/scripts/azure-pipelines/windows/deploy-pwsh.ps1
@@ -5,5 +5,5 @@
 
 # REPLACE WITH UTILITY-PREFIX.ps1
 
-$PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.4.0/PowerShell-7.4.0-win-x64.msi'
+$PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.4.1/PowerShell-7.4.1-win-x64.msi'
 InstallMSI -Url $PwshUrl -Name 'PowerShell Core'
diff --git a/versions/baseline.json b/versions/baseline.json
index 5e53741428..faf0e747fc 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3630,7 +3630,7 @@
     },
     "jasper": {
       "baseline": "4.1.0",
-      "port-version": 0
+      "port-version": 1
     },
     "jbig2dec": {
       "baseline": "0.20",
@@ -6754,7 +6754,7 @@
     },
     "portable-snippets": {
       "baseline": "2019-09-20",
-      "port-version": 3
+      "port-version": 4
     },
     "portaudio": {
       "baseline": "19.7",
diff --git a/versions/j-/jasper.json b/versions/j-/jasper.json
index 2d0db8e255..498bc70539 100644
--- a/versions/j-/jasper.json
+++ b/versions/j-/jasper.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3155b993a1ac52e0101edecb422a74513fc3a470",
+      "version": "4.1.0",
+      "port-version": 1
+    },
     {
       "git-tree": "bbbc1e3a2819d3e823e778a5a35045cc44946c23",
       "version": "4.1.0",
diff --git a/versions/p-/portable-snippets.json b/versions/p-/portable-snippets.json
index 7235f311e0..090d30c437 100644
--- a/versions/p-/portable-snippets.json
+++ b/versions/p-/portable-snippets.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e84e5d30ffa9c566c1a27ff12416163694c8ff26",
+      "version-date": "2019-09-20",
+      "port-version": 4
+    },
     {
       "git-tree": "cb5584d76235e5a975e7c201d244c385cfd1dae7",
       "version-date": "2019-09-20",