diff --git a/scripts/build-unit-test-docker b/scripts/build-unit-test-docker
index 9887f78..8a5fb5b 100755
--- a/scripts/build-unit-test-docker
+++ b/scripts/build-unit-test-docker
@@ -888,8 +888,6 @@
     device-tree-compiler \
     doxygen \
     flex \
-    g++-15 \
-    gcc-15 \
     git \
     glib-2.0 \
     gnupg \
@@ -950,6 +948,14 @@
     wget \
     xxd
 
+# Add the ubuntu-toolchain-r repository for later versions of GCC and install.
+RUN add-apt-repository ppa:ubuntu-toolchain-r/ppa && \
+    apt-get update && \
+    apt-get install -y \
+        gcc-15 \
+        g++-15 \
+        libstdc++-15-dev
+
 RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-15 15 \
   --slave /usr/bin/g++ g++ /usr/bin/g++-15 \
   --slave /usr/bin/gcov gcov /usr/bin/gcov-15 \