diff --git a/docker/compose.yaml b/docker/compose.yaml
index 298a95b9..e22bedf5 100644
--- a/docker/compose.yaml
+++ b/docker/compose.yaml
@@ -83,6 +83,10 @@ services:
         - GCC_CROSS_COMPILER_PACKAGES_ARM=gcc-aarch64-linux-gnu gcc-arm-linux-gnueabi gcc-i686-linux-gnu
         - GCC_CROSS_COMPILER_PACKAGES_X86=gcc-i686-linux-gnu
         - NODESOURCE=https://deb.nodesource.com/setup_16.x
+        # NodeJS v18 requires libc6 version >= 2.28, but that is not possible with this old Ubuntu Bionic
+        # Switching to newer Ubuntu is not a option either because of how fragile and snowflaky edk2 is
+        # Updating libc6 is just a terrible idea, that means that udk2017 cannot run NodeJS v20
+        # This is the best we can do
       # NonOSI wasn't used in 2017
   edk2-stable202008:
     build:
@@ -96,7 +100,7 @@ services:
         - GCC_VERSION=9
         - PYTHON_PACKAGES=python-is-python3 python2 python3
         - PYTHON_VERSION=python3
-        - NODESOURCE=https://deb.nodesource.com/setup_20.x
+        - NODESOURCE=https://deb.nodesource.com/setup_24.x
   edk2-stable202105:
     build:
       context: edk2
@@ -109,7 +113,7 @@ services:
         - GCC_VERSION=9
         - PYTHON_PACKAGES=python-is-python3 python2 python3
         - PYTHON_VERSION=python3
-        - NODESOURCE=https://deb.nodesource.com/setup_20.x
+        - NODESOURCE=https://deb.nodesource.com/setup_24.x
   edk2-stable202111:
     build:
       context: edk2
@@ -122,7 +126,7 @@ services:
         - GCC_VERSION=9
         - PYTHON_PACKAGES=python-is-python3 python2 python3
         - PYTHON_VERSION=python3
-        - NODESOURCE=https://deb.nodesource.com/setup_20.x
+        - NODESOURCE=https://deb.nodesource.com/setup_24.x
   # Building UniversalPayload from this point on is likely ???
   edk2-stable202205:
     build:
@@ -137,7 +141,7 @@ services:
         - GCC_VERSION=9
         - PYTHON_PACKAGES=python-is-python3 python2 python3
         - PYTHON_VERSION=python3
-        - NODESOURCE=https://deb.nodesource.com/setup_20.x
+        - NODESOURCE=https://deb.nodesource.com/setup_24.x
   edk2-stable202208:
     build:
       context: edk2
@@ -151,7 +155,7 @@ services:
         - GCC_VERSION=9
         - PYTHON_PACKAGES=python-is-python3 python2 python3
         - PYTHON_VERSION=python3
-        - NODESOURCE=https://deb.nodesource.com/setup_20.x
+        - NODESOURCE=https://deb.nodesource.com/setup_24.x
   edk2-stable202211:
     build:
       context: edk2
@@ -165,7 +169,7 @@ services:
         - GCC_VERSION=9
         - PYTHON_PACKAGES=python-is-python3 python2 python3
         - PYTHON_VERSION=python3
-        - NODESOURCE=https://deb.nodesource.com/setup_20.x
+        - NODESOURCE=https://deb.nodesource.com/setup_24.x
   edk2-stable202302:
     build:
       context: edk2
@@ -179,7 +183,7 @@ services:
         - GCC_VERSION=9
         - PYTHON_PACKAGES=python-is-python3 python2 python3
         - PYTHON_VERSION=python3
-        - NODESOURCE=https://deb.nodesource.com/setup_20.x
+        - NODESOURCE=https://deb.nodesource.com/setup_24.x
   edk2-stable202305:
     build:
       context: edk2
@@ -193,7 +197,7 @@ services:
         - GCC_VERSION=9
         - PYTHON_PACKAGES=python-is-python3 python2 python3
         - PYTHON_VERSION=python3
-        - NODESOURCE=https://deb.nodesource.com/setup_20.x
+        - NODESOURCE=https://deb.nodesource.com/setup_24.x
   # Since edk2-stable202305 the GCC_VERSION should be more flexible
   # https://github.com/tianocore/edk2/commit/0fc07b1c6a491fa1e81daed6cfc2ec33c8cac973
   edk2-stable202308:
@@ -209,7 +213,7 @@ services:
         - GCC_VERSION=12
         - PYTHON_PACKAGES=python-is-python3 python2 python3
         - PYTHON_VERSION=python3
-        - NODESOURCE=https://deb.nodesource.com/setup_20.x
+        - NODESOURCE=https://deb.nodesource.com/setup_24.x
   edk2-stable202311:
     build:
       context: edk2
@@ -223,7 +227,7 @@ services:
         - GCC_VERSION=12
         - PYTHON_PACKAGES=python-is-python3 python2 python3
         - PYTHON_VERSION=python3
-        - NODESOURCE=https://deb.nodesource.com/setup_20.x
+        - NODESOURCE=https://deb.nodesource.com/setup_24.x
   edk2-stable202402:
     build:
       context: edk2
@@ -237,7 +241,7 @@ services:
         - GCC_VERSION=12
         - PYTHON_PACKAGES=python-is-python3 python2 python3
         - PYTHON_VERSION=python3
-        - NODESOURCE=https://deb.nodesource.com/setup_20.x
+        - NODESOURCE=https://deb.nodesource.com/setup_24.x
   edk2-stable202405:
     build:
       context: edk2
@@ -251,7 +255,7 @@ services:
         - GCC_VERSION=12
         - PYTHON_PACKAGES=python-is-python3 python2 python3
         - PYTHON_VERSION=python3
-        - NODESOURCE=https://deb.nodesource.com/setup_20.x
+        - NODESOURCE=https://deb.nodesource.com/setup_24.x
   edk2-stable202408.01:
     build:
       context: edk2
@@ -265,7 +269,7 @@ services:
         - GCC_VERSION=13
         - PYTHON_PACKAGES=python-is-python3 python3
         - PYTHON_VERSION=python3
-        - NODESOURCE=https://deb.nodesource.com/setup_20.x
+        - NODESOURCE=https://deb.nodesource.com/setup_24.x
   edk2-stable202411:
     build:
       context: edk2
@@ -279,7 +283,7 @@ services:
         - GCC_VERSION=13
         - PYTHON_PACKAGES=python-is-python3 python3
         - PYTHON_VERSION=python3
-        - NODESOURCE=https://deb.nodesource.com/setup_20.x
+        - NODESOURCE=https://deb.nodesource.com/setup_24.x
   edk2-stable202502:
     build:
       context: edk2
@@ -293,7 +297,7 @@ services:
         - GCC_VERSION=13
         - PYTHON_PACKAGES=python-is-python3 python3
         - PYTHON_VERSION=python3
-        - NODESOURCE=https://deb.nodesource.com/setup_20.x
+        - NODESOURCE=https://deb.nodesource.com/setup_24.x
   edk2-stable202505:
     build:
       context: edk2
@@ -307,7 +311,7 @@ services:
         - GCC_VERSION=13
         - PYTHON_PACKAGES=python-is-python3 python3
         - PYTHON_VERSION=python3
-        - NODESOURCE=https://deb.nodesource.com/setup_20.x
+        - NODESOURCE=https://deb.nodesource.com/setup_24.x
   edk2-stable202508:
     build:
       context: edk2
@@ -321,7 +325,7 @@ services:
         - GCC_VERSION=13
         - PYTHON_PACKAGES=python-is-python3 python3
         - PYTHON_VERSION=python3
-        - NODESOURCE=https://deb.nodesource.com/setup_20.x
+        - NODESOURCE=https://deb.nodesource.com/setup_24.x
   #==================
   # linux
   #==================
diff --git a/docker/edk2/Dockerfile b/docker/edk2/Dockerfile
index c947df42..d92b41bb 100644
--- a/docker/edk2/Dockerfile
+++ b/docker/edk2/Dockerfile
@@ -4,7 +4,7 @@
 ARG SOURCE_IMAGE=buildpack-deps:focal
 ARG INTERMEDIATE_IMAGE=base
 ARG TARGETARCH=amd64
-ARG NODESOURCE=https://deb.nodesource.com/setup_20.x
+ARG NODESOURCE=https://deb.nodesource.com/setup_24.x
 
 #=============
 # "base" stage with all needed build dependencies
diff --git a/docker/linux/Dockerfile b/docker/linux/Dockerfile
index 5c894e93..eead175e 100644
--- a/docker/linux/Dockerfile
+++ b/docker/linux/Dockerfile
@@ -1,7 +1,7 @@
 # This is multi-stage Dockerfile
 #   Docs: https://docs.docker.com/build/building/multi-stage/
 
-ARG SOURCE_IMAGE=ubuntu:jammy
+ARG SOURCE_IMAGE=ubuntu:noble
 ARG TARGETARCH=amd64
 
 #=============