diff --git a/Jenkinsfile b/Jenkinsfile
index 372279d9..fb048db6 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -35,6 +35,7 @@ def preserveContainersOnFailure = env.preserve_containers_on_failure?.toBoolean(
 
 def buildCustomComponents = env.build_custom_components?.toBoolean() ?: false
 def openmpfCustomRepoCredId = env.openmpf_custom_repo_cred_id
+def openmpfProjectsRepoCredId = env.openmpf_projects_repo_cred_id
 def applyCustomConfig = env.apply_custom_config?.toBoolean() ?: false
 def mvnTestOptions = env.mvn_test_options ?: ''
 
@@ -59,6 +60,8 @@ def preDockerBuildScriptPath = env.pre_docker_build_script_path
 def runTrivyScans = env.run_trivy_scans?.toBoolean() ?: false
 def runTrivyInsecure = env.run_trivy_insecure?.toBoolean() ?: false
 def runTrivyMaxTasks = env.run_trivy_max_tasks?.toInteger() ?: 4
+def trivyImg = env.trivy_image ?: 'aquasec/trivy:0.69.3@sha256:bcc376de8d77cfe086a917230e818dc9f8528e3c852f7b1aff648949b6258d1c'
+
 def dependencyTrackCredId = env.dependency_track_cred_id
 def dependencyTrackUploadSbom = env.dependency_track_upload_sbom?.toBoolean() ?: false
 def skipIntegrationTests = env.skip_integration_tests?.toBoolean() ?: false
@@ -93,10 +96,9 @@ class Repo {
 }
 
 
-def openmpfProjectsRepo = new Repo('openmpf-projects', 'https://github.com/openmpf/openmpf-projects.git',
+def openmpfProjectsRepo = new Repo('openmpf-projects', env.openmpf_projects_url,
         env.openmpf_projects_branch ?: 'develop')
 
-
 def openmpfDockerRepo = Repo.projectsSubRepo('openmpf-docker', env.openmpf_docker_branch)
 
 def openmpfRepo = Repo.projectsSubRepo('openmpf', env.openmpf_branch)
@@ -182,9 +184,19 @@ try {
         // Directory may not exist. In that case the command doesn't do anything.
         sh "rm -rf $openmpfDockerRepo.path/test-reports/*"
 
-        if (!fileExists(openmpfProjectsRepo.path)) {
-            sh "git clone --recurse-submodules $openmpfProjectsRepo.url"
-        }
+        checkout(
+            $class: 'GitSCM',
+            userRemoteConfigs: [[url: openmpfProjectsRepo.url, credentialsId: openmpfCustomRepoCredId]],
+            extensions: [
+                [$class: 'CleanBeforeCheckout'],
+                [$class: 'GitLFSPull'],
+                [$class: 'RelativeTargetDirectory', relativeTargetDir: openmpfProjectsRepo.path],
+                [$class: 'SubmoduleOption',
+                    disableSubmodules: false,
+                    parentCredentials: true,
+                    recursiveSubmodules: true,
+                    trackingSubmodules: false]])
+
         dir(openmpfProjectsRepo.path) {
             sh 'git clean -ffd'
             sh 'git submodule foreach git clean -ffd'
@@ -254,8 +266,8 @@ try {
     stage('Build images') {
     timeout(time: buildTimeout, unit: 'HOURS') {
         // Make sure we are using most recent version of external images
-        for (externalImage in ['docker/dockerfile:1.2', 'postgres:17-alpine',
-                               'redis:alpine', 'ubuntu:20.04']) {
+        for (externalImage in ['docker/dockerfile:1.20', 'postgres:17-alpine',
+                               'redis:alpine', 'ubuntu:24.04']) {
             try {
                 sh "docker pull '$externalImage'"
             }
@@ -361,14 +373,14 @@ try {
                         "../../$customComponentsRepo.path/docker-compose.custom-components.yml"
                 componentComposeFiles += ":$customComponentsComposeFile"
 
-                def customGpuOnlyComponentsComposeFile =
-                            "../../$customComponentsRepo.path/docker-compose.custom-gpu-only-components.yml"
-                componentComposeFiles += ":$customGpuOnlyComponentsComposeFile"
+                // def customGpuOnlyComponentsComposeFile =
+                //             "../../$customComponentsRepo.path/docker-compose.custom-gpu-only-components.yml"
+                // componentComposeFiles += ":$customGpuOnlyComponentsComposeFile"
 
                 customComponentServices =
                         readYaml(text: shOutput("cat $customComponentsComposeFile")).services.keySet()
-                customComponentServices +=
-                        readYaml(text: shOutput("cat $customGpuOnlyComponentsComposeFile")).services.keySet()
+                // customComponentServices +=
+                //         readYaml(text: shOutput("cat $customGpuOnlyComponentsComposeFile")).services.keySet()
             }
 
             withEnv(["COMPOSE_FILE=$componentComposeFiles"]) {
@@ -468,7 +480,8 @@ try {
                 composeYaml = readYaml(text: shOutput('docker compose config'))
             }
         }
-        sh 'docker pull aquasec/trivy'
+
+        sh "docker pull $trivyImg"
         def trivyVolume = "trivy_$inProgressTag"
         sh "docker volume create $trivyVolume"
         try {
@@ -479,22 +492,22 @@ try {
             def taskQueue = []
 
             // download db files
-            def exitCode = shStatus("docker run --rm " +
-                            "-e TRIVY_INSECURE=${runTrivyInsecure} " +
-                            "-v /var/run/docker.sock:/var/run/docker.sock " +
-                            "-v $trivyVolume:/root/.cache/ " +
-                            "aquasec/trivy image --download-db-only")
-            if (exitCode != 0) {
+            def dbDownloadExitCode = shStatus(
+                "docker run --rm " +
+                "-e TRIVY_INSECURE=${runTrivyInsecure} " +
+                "-v $trivyVolume:/root/.cache/ " +
+                "$trivyImg image --download-db-only")
+            if (dbDownloadExitCode != 0) {
                 echo 'Trivy failed to download the db files'
             }
 
             // download the java db files
-            exitCode = shStatus("docker run --rm " +
-                            "-e TRIVY_INSECURE=${runTrivyInsecure} " +
-                            "-v /var/run/docker.sock:/var/run/docker.sock " +
-                            "-v $trivyVolume:/root/.cache/ " +
-                            "aquasec/trivy image --download-java-db-only")
-            if (exitCode != 0) {
+            dbDownloadExitCode = shStatus(
+                "docker run --rm " +
+                "-e TRIVY_INSECURE=${runTrivyInsecure} " +
+                "-v $trivyVolume:/root/.cache/ " +
+                "$trivyImg image --download-java-db-only")
+            if (dbDownloadExitCode != 0) {
                 echo 'Trivy failed to download the java db files'
             }
 
@@ -503,28 +516,29 @@ try {
                     // fetch service using the serviceName
                     def service = composeYaml.services[serviceName]
 
+                    def workDir = "${pwd()}/$openmpfDockerRepo.path"
+
                     // save the output to a file
-                    exitCode = shStatus("docker run --rm " +
+                    def exitCode = shStatus("docker run --rm " +
                             "-e TRIVY_INSECURE=${runTrivyInsecure} " +
-                            "-v /var/run/docker.sock:/var/run/docker.sock " +
                             "-v $trivyVolume:/root/.cache/ " +
-                            "-v '${pwd()}/$openmpfDockerRepo.path/trivyignore.txt:/.trivyignore' " +
-                            "-v '${pwd()}/$openmpfDockerRepo.path:/trivy' " +
-                            "aquasec/trivy image --format cyclonedx --output /trivy/${serviceName}_sbom.json " +
-                            "--timeout 30m $service.image")
+                            "-v '${workDir}/trivyignore.txt:/.trivyignore' " +
+                            "--mount type=image,source=${service.image},target=/data/rootfs " +
+                            "$trivyImg rootfs --format cyclonedx " +
+                            "--timeout 30m /data/rootfs > ${workDir}/${serviceName}_sbom.json")
+
                     if (exitCode != 0) {
                         failedImages << service.image
                     } else {
                         // print the vulnerabilities to a file
                         exitCode = shStatus("docker run --rm " +
                             "-e TRIVY_INSECURE=${runTrivyInsecure} " +
-                            "-v /var/run/docker.sock:/var/run/docker.sock " +
                             "-v $trivyVolume:/root/.cache/ " +
-                            "-v '${pwd()}/$openmpfDockerRepo.path/trivyignore.txt:/.trivyignore' " +
-                            "-v '${pwd()}/$openmpfDockerRepo.path:/trivy' " +
-                            "aquasec/trivy sbom --severity CRITICAL,HIGH --exit-code 1 " +
-                            "--format json --output /trivy/${serviceName}_trivy.json " +
-                            "--timeout 30m --scanners vuln /trivy/${serviceName}_sbom.json")
+                            "-v '${workDir}/trivyignore.txt:/.trivyignore' " +
+                            "-v ${workDir}/${serviceName}_sbom.json:/data/sbom.json " +
+                            "$trivyImg sbom --severity CRITICAL,HIGH --exit-code 1 " +
+                            "--format json --timeout 30m --scanners vuln " +
+                            "/data/sbom.json > ${workDir}/${serviceName}_trivy.json")
                         if (exitCode != 0) {
                             failedImages << service.image
                         }
@@ -535,20 +549,13 @@ try {
 
                         // upload to dependency track
                         if (dependencyTrackUploadSbom) {
-                            def (serviceImageName, serviceVersion) = service.image?.split(':')
-                            if (imageVersion) {
-                                projectVersion = imageVersion
-                            } else {
-                                if (service.version) {
-                                    projectVersion = service.version
-                                }
-                            }
+                            def (serviceImageName, serviceVersion) = service.image.split(':')
 
                             // publish using the dependency track plugin
                             dependencyTrackPublisher(
                                 artifact: "${openmpfDockerRepo.path}/${serviceName}_sbom.json",
                                 projectName: serviceImageName,
-                                projectVersion: projectVersion,
+                                projectVersion: imageVersion ?: serviceVersion,
                                 synchronous: false,
                                 dependencyTrackApiKey: dependencyTrackCredId,
                                 projectProperties: [
@@ -574,7 +581,7 @@ try {
 
                 // add tasks the map
                 for (int i = 0; i < taskCount; i++) {
-                    def taskName = "Task ${i}" 
+                    def taskName = "Task ${i}"
                     tasksToRun[taskName] = taskQueue.remove(0)
                 }
 
diff --git a/components/cli_runner/tests/test_cli_runner.py b/components/cli_runner/tests/test_cli_runner.py
index 891b8ffb..456761b6 100644
--- a/components/cli_runner/tests/test_cli_runner.py
+++ b/components/cli_runner/tests/test_cli_runner.py
@@ -410,7 +410,7 @@ def test_can_run_generic_job(self):
 
         self.assertEqual(1, len(tracks))
         track = tracks[0]
-        self.assertAlmostEqual(95, track['confidence'])
+        self.assertAlmostEqual(94, track['confidence'])
         expected_properties = {
             'MISSING_LANGUAGE_MODELS': '',
             'OSD_FALLBACK_OCCURRED': 'false',
@@ -431,7 +431,7 @@ def test_can_run_generic_job(self):
         self.assertEqual(0, detection['y'])
         self.assertEqual(0, detection['width'])
         self.assertEqual(0, detection['height'])
-        self.assertAlmostEqual(95, detection['confidence'])
+        self.assertAlmostEqual(94, detection['confidence'])
         self.assertEqual(detection, track['exemplar'])
         self.assertEqual(expected_properties, detection['detectionProperties'])
 
diff --git a/components/cpp_component_build/Dockerfile b/components/cpp_component_build/Dockerfile
index 76995f79..e819818d 100644
--- a/components/cpp_component_build/Dockerfile
+++ b/components/cpp_component_build/Dockerfile
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.4
+# syntax=docker/dockerfile:1.20
 
 #############################################################################
 # NOTICE                                                                    #
@@ -28,39 +28,41 @@
 
 ARG BUILD_REGISTRY
 ARG BUILD_TAG=latest
-FROM ${BUILD_REGISTRY}openmpf_build:${BUILD_TAG} as openmpf_build
+FROM ${BUILD_REGISTRY}openmpf_build:${BUILD_TAG} AS openmpf_build
 
 
-FROM ubuntu:20.04
+FROM ubuntu:24.04
 
 SHELL ["/bin/bash", "-o", "errexit", "-o", "pipefail", "-c"]
 
-ENV LANG C.UTF-8
-ENV LC_ALL C.UTF-8
+ENV LANG=C.UTF-8
+ENV LC_ALL=C.UTF-8
 
 RUN --mount=type=tmpfs,target=/var/cache/apt \
     --mount=type=tmpfs,target=/var/lib/apt/lists  \
-    --mount=type=tmpfs,target=/tmp \
-    apt-get update; \
-    apt-get upgrade -y; \
+    --mount=type=tmpfs,target=/tmp <<eot
+    apt-get update
+    apt-get upgrade -y
     apt-get install --no-install-recommends -y \
         wget ca-certificates gnupg2 cmake make g++ libgtest-dev  liblog4cxx-dev libboost-dev \
-        libavcodec58 libavformat58 libswscale5 libopenblas0-pthread liblapacke; \
-    # Can't set up cuda repo at the beginning because it requires wget ca-certificates gnupg2
-    wget -O- https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/3bf863cc.pub \
-            | apt-key add -; \
-    echo "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64 /" \
-        > /etc/apt/sources.list.d/cuda.list; \
-    apt-get update; \
+        libavcodec60 libavformat60 libswscale7 libopenblas0-pthread liblapacke
+
+    # Cannot set up cuda repo at the beginning because it requires wget ca-certificates gnupg2
+    wget -O- https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2404/x86_64/3bf863cc.pub \
+        | apt-key add -
+    echo "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2404/x86_64 /" \
+        > /etc/apt/sources.list.d/cuda.list
+    apt-get update
     apt-get install -y --no-install-recommends \
-        cuda-minimal-build-11-4 libcudnn8-dev=8.2.4.15-1+cuda11.4 libcudnn8=8.2.4.15-1+cuda11.4 \
-        libcublas-dev-11-4; \
-    # OpenCV doesn't use the statically compiled CUDA libraries except for libcudart and they are relatively large.
-    rm /usr/local/cuda/lib64/libcublasLt_static.a /usr/local/cuda/lib64/libcublas_static.a \
-        /usr/lib/x86_64-linux-gnu/libcudnn*.a; \
-    ln --symbolic /usr/bin/cmake /usr/bin/cmake3;
+        cuda-minimal-build-12-9 libcudnn9-dev-cuda-12 libcublas-dev-12-9
 
-COPY --from=openmpf_build /opt/opencv-4.9.0 /opt/opencv-4.9.0
+    # OpenCV does not use the statically compiled CUDA libraries except for libcudart and they are relatively large.
+    find /usr/local/cuda/lib64/ -name '*.a' -not -name 'libcudart_static.a' -delete
+    ln --symbolic /usr/bin/cmake /usr/bin/cmake3
+eot
+
+
+COPY --from=openmpf_build /opt/opencv-4.13.0 /opt/opencv-4.13.0
 
 COPY --from=openmpf_build /usr/local/bin/ffmpeg /usr/local/bin/ffprobe /usr/local/bin/
 
@@ -71,19 +73,21 @@ RUN mkdir /home/mpf; echo 'find_package(mpfCMakeHelpers REQUIRED)' > /home/mpf/C
 COPY --from=openmpf_build /build-artifacts/mpf-sdk-install/include /home/mpf/mpf-sdk-install/include
 COPY --from=openmpf_build /build-artifacts/mpf-sdk-install/lib /home/mpf/mpf-sdk-install/lib
 
-RUN echo '/opt/opencv-4.9.0/lib' > /etc/ld.so.conf.d/opencv.conf; \
-    echo '/home/mpf/mpf-sdk-install/lib' > /etc/ld.so.conf.d/mpf.conf; \
+RUN <<eot
+    echo '/opt/opencv-4.13.0/lib' > /etc/ld.so.conf.d/opencv.conf
+    echo '/home/mpf/mpf-sdk-install/lib' > /etc/ld.so.conf.d/mpf.conf
     ldconfig
+eot
 
 COPY cpp_component_build/scripts /scripts
 
-ENV PATH /scripts:$PATH
+ENV PATH=/scripts:$PATH
 
-ENV CMAKE_PREFIX_PATH /home/mpf/mpf-sdk-install/lib/cmake
+ENV CMAKE_PREFIX_PATH=/home/mpf/mpf-sdk-install/lib/cmake
 
-ENV BUILD_DIR /home/mpf/component_build
+ENV BUILD_DIR=/home/mpf/component_build
 
-ENV SRC_DIR /home/mpf/component_src
+ENV SRC_DIR=/home/mpf/component_src
 
 WORKDIR $SRC_DIR
 
diff --git a/components/cpp_executor/Dockerfile b/components/cpp_executor/Dockerfile
index a65a3d90..d6c27a25 100644
--- a/components/cpp_executor/Dockerfile
+++ b/components/cpp_executor/Dockerfile
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.4
+# syntax=docker/dockerfile:1.20
 
 #############################################################################
 # NOTICE                                                                    #
@@ -31,7 +31,7 @@ ARG BUILD_TAG=latest
 FROM ${BUILD_REGISTRY}openmpf_build:${BUILD_TAG} AS openmpf_build
 
 
-FROM ubuntu:20.04 AS common
+FROM ubuntu:24.04 AS common
 
 SHELL ["/bin/bash", "-o", "errexit", "-o", "pipefail", "-c"]
 
@@ -40,35 +40,18 @@ ENV LC_ALL=C.UTF-8
 
 RUN --mount=type=tmpfs,target=/var/cache/apt \
     --mount=type=tmpfs,target=/var/lib/apt/lists  \
-    --mount=type=tmpfs,target=/tmp \
-    apt-get update; \
-    apt-get upgrade -y; \
-    apt-get install --no-install-recommends -y wget ca-certificates gnupg2; \
-    # Can't set up cuda repo at the beginning because it requires wget ca-certificates gnupg2
-    wget -O- https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/3bf863cc.pub \
-            | apt-key add -; \
-    echo "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64 /" \
-        > /etc/apt/sources.list.d/cuda.list; \
-    apt-get update; \
-    apt-get install -y --no-install-recommends cuda-cudart-11-4;
-
-
-COPY --from=openmpf_build \
-    /usr/local/bin/python3.12 /usr/local/bin/python3.12-config \
-    /usr/local/bin/pip3.12 /usr/local/bin/pip3 \
-    /usr/local/bin/
-
-COPY --from=openmpf_build /usr/local/lib/python3.12 /usr/local/lib/python3.12
-
-COPY --from=openmpf_build /usr/local/lib/libpython3.12.so.1.0 /usr/local/lib/
-
-RUN <<eot
-    cd /usr/local/bin
-    ln --symbolic python3.12 python3
-    ln --symbolic python3.12-config python3-config
-    cd /usr/local/lib
-    ln --symbolic libpython3.12.so.1.0 libpython3.12.so
-    ln --symbolic /usr/local/lib/libpython3.12.so.1.0 /lib/x86_64-linux-gnu/libpython3.12.so.1.0
+    --mount=type=tmpfs,target=/tmp <<eot
+    apt-get update
+    apt-get upgrade -y
+    apt-get install --no-install-recommends -y wget ca-certificates gnupg2 python3 libpython3.12t64
+
+    # Can not set up cuda repo at the beginning because it requires wget ca-certificates gnupg2
+    wget -O- https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2404/x86_64/3bf863cc.pub \
+        | apt-key add -
+    echo "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2404/x86_64 /" \
+        > /etc/apt/sources.list.d/cuda.list
+    apt-get update
+    apt-get install -y --no-install-recommends cuda-cudart-12-9
 eot
 
 COPY --from=openmpf_build /usr/local/bin/ffmpeg /usr/local/bin/ffprobe /usr/local/bin/
@@ -103,7 +86,7 @@ COPY --from=openmpf_build /build-artifacts/install/bin/amq_detection_component \
 COPY --from=openmpf_build /build-artifacts/install/config/Log4cxxConfig.xml $MPF_HOME/config/
 
 COPY --from=openmpf_build /build-artifacts/install/lib/mpf_cpp_sdk.cpython-312-x86_64-linux-gnu.so \
-                          /usr/local/lib/python3.12/lib-dynload/
+                          /usr/lib/python3.12/lib-dynload
 
 COPY --from=openmpf_build /scripts/* /scripts/
 
@@ -115,7 +98,6 @@ ENV BUILD_DIR=/home/mpf/component_build
 
 ENV PLUGINS_DIR=$MPF_HOME/plugins
 
-
 COPY docker-entrypoint.sh component-executor.py /scripts/
 
 COPY cli_runner/*.py cli_runner/Log4cxxConfig.xml /scripts/cli_runner/
diff --git a/components/java_component_build/Dockerfile b/components/java_component_build/Dockerfile
index 52cf3143..e94c8e5b 100644
--- a/components/java_component_build/Dockerfile
+++ b/components/java_component_build/Dockerfile
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.4
+# syntax=docker/dockerfile:1.20
 
 #############################################################################
 # NOTICE                                                                    #
@@ -31,7 +31,7 @@ ARG BUILD_TAG=latest
 FROM ${BUILD_REGISTRY}openmpf_build:${BUILD_TAG} AS openmpf_build
 
 
-FROM ubuntu:20.04
+FROM ubuntu:24.04
 
 SHELL ["/bin/bash", "-o", "errexit", "-o", "pipefail", "-c"]
 
@@ -40,11 +40,12 @@ ENV LC_ALL=C.UTF-8
 
 RUN --mount=type=tmpfs,target=/var/cache/apt \
     --mount=type=tmpfs,target=/var/lib/apt/lists  \
-    --mount=type=tmpfs,target=/tmp \
-    apt-get update; \
-    apt-get upgrade -y; \
+    --mount=type=tmpfs,target=/tmp <<eot
+    apt-get update
+    apt-get upgrade -y
     DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
-        openjdk-17-jdk-headless wget ca-certificates;
+        openjdk-25-jdk-headless wget ca-certificates
+eot
 
 COPY --from=openmpf_build /usr/local/bin/ffmpeg /usr/local/bin/ffprobe /usr/local/bin/
 
diff --git a/components/java_executor/Dockerfile b/components/java_executor/Dockerfile
index c15258d5..6dbb318b 100644
--- a/components/java_executor/Dockerfile
+++ b/components/java_executor/Dockerfile
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.4
+# syntax=docker/dockerfile:1.20
 
 #############################################################################
 # NOTICE                                                                    #
@@ -31,7 +31,7 @@ ARG BUILD_TAG=latest
 FROM ${BUILD_REGISTRY}openmpf_build:${BUILD_TAG} AS openmpf_build
 
 
-FROM ubuntu:20.04
+FROM ubuntu:24.04
 
 SHELL ["/bin/bash", "-o", "errexit", "-o", "pipefail", "-c"]
 
@@ -40,27 +40,11 @@ ENV LC_ALL=C.UTF-8
 
 RUN --mount=type=tmpfs,target=/var/cache/apt \
     --mount=type=tmpfs,target=/var/lib/apt/lists  \
-    --mount=type=tmpfs,target=/tmp \
-    apt-get update; \
-    apt-get upgrade -y; \
-    DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y openjdk-17-jre-headless;
-
-COPY --from=openmpf_build \
-    /usr/local/bin/python3.12 /usr/local/bin/python3.12-config \
-    /usr/local/bin/pip3.12 /usr/local/bin/pip3 \
-    /usr/local/bin/
-
-COPY --from=openmpf_build /usr/local/lib/python3.12 /usr/local/lib/python3.12
-
-COPY --from=openmpf_build /usr/local/lib/libpython3.12.so.1.0 /usr/local/lib/
-
-RUN <<eot
-    cd /usr/local/bin
-    ln --symbolic python3.12 python3
-    ln --symbolic python3.12-config python3-config
-    cd /usr/local/lib
-    ln --symbolic libpython3.12.so.1.0 libpython3.12.so
-    ln --symbolic /usr/local/lib/libpython3.12.so.1.0 /lib/x86_64-linux-gnu/libpython3.12.so.1.0
+    --mount=type=tmpfs,target=/tmp <<eot
+    apt-get update
+    apt-get upgrade -y
+    DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
+        openjdk-25-jre-headless python3
 eot
 
 COPY --from=openmpf_build /usr/local/bin/ffmpeg /usr/local/bin/ffprobe /usr/local/bin/
diff --git a/components/python/Dockerfile b/components/python/Dockerfile
index 5d97085a..42ad977d 100644
--- a/components/python/Dockerfile
+++ b/components/python/Dockerfile
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.4
+# syntax=docker/dockerfile:1.20
 
 #############################################################################
 # NOTICE                                                                    #
@@ -31,7 +31,7 @@ ARG BUILD_TAG=latest
 FROM ${BUILD_REGISTRY}openmpf_build:${BUILD_TAG} AS openmpf_build
 
 
-FROM ubuntu:20.04 AS common
+FROM ubuntu:24.04 AS common
 
 SHELL ["/bin/bash", "-o", "errexit", "-o", "pipefail", "-c"]
 
@@ -44,32 +44,11 @@ RUN --mount=type=tmpfs,target=/var/cache/apt \
     --mount=type=tmpfs,target=/tmp <<eot
     apt-get update
     apt-get upgrade -y
-    # libglib2.0-0 and libgl1-mesa-glx are needed for opencv-python.
-    apt-get install -y ca-certificates libglib2.0-0 libgl1-mesa-glx libsqlite3-0
+    # libgl1 and libglib2.0-0 are needed for opencv-python.
+    apt-get install --no-install-recommends -y \
+        ca-certificates python3 libpython3.12t64 libgl1 libglib2.0-0
 eot
 
-COPY --from=openmpf_build \
-    /usr/local/bin/python3.12 /usr/local/bin/python3.12-config \
-    /usr/local/bin/pip3.12 /usr/local/bin/pip3 \
-    /usr/local/bin/
-
-COPY --from=openmpf_build /usr/local/lib/python3.12 /usr/local/lib/python3.12
-
-COPY --from=openmpf_build /usr/local/lib/libpython3.12.so.1.0 /usr/local/lib/
-
-# The Python headers are needed to build Python libraries with C extensions.
-COPY --from=openmpf_build /usr/local/include/python3.12 /usr/local/include/python3.12
-
-RUN <<eot
-    cd /usr/local/bin
-    ln --symbolic python3.12 python3
-    ln --symbolic python3.12-config python3-config
-    cd /usr/local/lib
-    ln --symbolic libpython3.12.so.1.0 libpython3.12.so
-    ln --symbolic /usr/local/lib/libpython3.12.so.1.0 /lib/x86_64-linux-gnu/libpython3.12.so.1.0
-eot
-
-
 COPY --from=openmpf_build /usr/local/bin/ffmpeg /usr/local/bin/ffprobe /usr/local/bin/
 
 ENV MPF_HOME=/opt/mpf
@@ -80,26 +59,30 @@ ENV COMPONENT_VIRTUALENV=$MPF_HOME/plugin-venv
 ENV PATH=$COMPONENT_VIRTUALENV/bin:/scripts:$PATH
 
 
-#########################################
+
 FROM common AS build_api
 
 RUN --mount=type=tmpfs,target=/var/cache/apt \
     --mount=type=tmpfs,target=/var/lib/apt/lists  \
-    --mount=type=tmpfs,target=/tmp \
-    apt-get update; \
-    apt-get upgrade -y; \
+    --mount=type=tmpfs,target=/tmp <<eot
+    apt-get update
+    apt-get upgrade -y
+
     # Some pip packages will try to compile C/C++ extensions during install. To compile the C/C++
     # extensions, a C++ compiler and the Python development headers must be installed.
-    apt-get install --no-install-recommends -y g++
+    apt-get install --no-install-recommends -y python3.12-venv python3.12-dev g++
+eot
 
-RUN python3 -m venv "$COMPONENT_VIRTUALENV"; \
-    pip3 config --site set global.no-cache-dir true; \
-    pip3 install --upgrade pip; \
-    pip3 install --upgrade setuptools;
+RUN <<eot
+    python3 -m venv "$COMPONENT_VIRTUALENV"
+    pip3 config --site set global.no-cache-dir true
+    pip3 install --upgrade pip
+eot
 
-RUN --mount=from=openmpf_build,source=/home/mpf/openmpf-projects/openmpf-python-component-sdk/detection,target=/tmp/python,rw \
-    pip3 install --no-cache-dir /tmp/python/api /tmp/python/component_util; \
+RUN --mount=from=openmpf_build,source=/home/mpf/openmpf-projects/openmpf-python-component-sdk/detection,target=/tmp/python,rw <<eot
+    pip3 install --no-cache-dir /tmp/python/api /tmp/python/component_util
     python3 -m unittest discover --verbose --buffer --start-directory /tmp/python/component_util/tests
+eot
 
 ENV SRC_DIR=/home/mpf/component_src
 
@@ -117,7 +100,7 @@ LABEL org.label-schema.build-date="" \
       org.label-schema.vendor="MITRE"
 
 
-#########################################
+
 # Install and test the text splitter in a different stage so that the dependencies don't end up in
 # the base image for all Python components.
 FROM build_api AS build_text_splitter
@@ -137,7 +120,7 @@ RUN python3 tests/test_text_splitter.py
 RUN rm -r tests
 
 
-#########################################
+
 FROM build_api AS build
 
 # Copy the text splitter source code in to the image so that components can choose to install it in
@@ -147,7 +130,7 @@ COPY --from=build_text_splitter \
     /home/mpf/openmpf-projects/openmpf-python-component-sdk/detection/nlp_text_splitter
 
 
-#########################################
+
 FROM common AS copy_libs
 
 RUN --mount=type=bind,from=openmpf_build,source=/build-artifacts/install/lib,target=/tmp/mpf-libs \
@@ -157,7 +140,7 @@ RUN --mount=type=bind,from=openmpf_build,source=/build-artifacts/install/lib,tar
     /tmp/copy_libs.sh /tmp/amq_detection_component /libs-to-copy /tmp/mpf-libs
 
 
-#########################################
+
 FROM common AS executor
 
 COPY --from=copy_libs /libs-to-copy /usr/lib/x86_64-linux-gnu/
@@ -196,7 +179,8 @@ LABEL org.label-schema.build-date="" \
       org.label-schema.vcs-url="https://github.com/openmpf/openmpf-python-component-sdk" \
       org.label-schema.vendor="MITRE"
 
-#########################################
+
+
 FROM executor AS ssb
 
 COPY --from=build $COMPONENT_VIRTUALENV $COMPONENT_VIRTUALENV
@@ -216,5 +200,6 @@ LABEL org.label-schema.build-date="" \
       org.label-schema.vcs-url="https://github.com/openmpf/openmpf-python-component-sdk" \
       org.label-schema.vendor="MITRE"
 
-#########################################
+
+
 FROM executor
diff --git a/docker-compose.components.test.yml b/docker-compose.components.test.yml
index b4fb18df..69249348 100644
--- a/docker-compose.components.test.yml
+++ b/docker-compose.components.test.yml
@@ -25,8 +25,6 @@
 #############################################################################
 
 
-version: '3.7'
-
 x-build-args:
   &test-args
   build:
diff --git a/docker-compose.components.yml b/docker-compose.components.yml
index 0db6629d..956ffffa 100644
--- a/docker-compose.components.yml
+++ b/docker-compose.components.yml
@@ -26,8 +26,6 @@
 
 # Use this file in conjunction with docker-compose.core.yml.
 
-version: '3.7'
-
 
 x-component-base: &component-base
   environment: &common-env-vars
diff --git a/docker-compose.core.yml b/docker-compose.core.yml
index e8798754..4624b9f4 100644
--- a/docker-compose.core.yml
+++ b/docker-compose.core.yml
@@ -24,8 +24,6 @@
 # limitations under the License.                                            #
 #############################################################################
 
-version: '3.7'
-
 services:
   db:
     image: postgres:17-alpine
diff --git a/docker-compose.elk.yml b/docker-compose.elk.yml
index 2ee9111d..41b5b59a 100644
--- a/docker-compose.elk.yml
+++ b/docker-compose.elk.yml
@@ -1,4 +1,3 @@
-version: '3.7'
 
 services:
   elasticsearch:
diff --git a/docker-compose.https.yml b/docker-compose.https.yml
index 46e244d2..10854222 100644
--- a/docker-compose.https.yml
+++ b/docker-compose.https.yml
@@ -26,8 +26,6 @@
 
 # Use this file in conjunction with docker-compose.core.yml.
 
-version: '3.7'
-
 services:
   workflow-manager:
     environment:
diff --git a/docker-compose.integration.test.yml b/docker-compose.integration.test.yml
index 9c1daa70..0b5220dc 100644
--- a/docker-compose.integration.test.yml
+++ b/docker-compose.integration.test.yml
@@ -24,8 +24,6 @@
 # limitations under the License.                                            #
 #############################################################################
 
-version: '3.7'
-
 services:
   db:
     image: postgres:17-alpine
diff --git a/docker-compose.users.yml b/docker-compose.users.yml
index ed825a4d..7d9b40e5 100644
--- a/docker-compose.users.yml
+++ b/docker-compose.users.yml
@@ -26,8 +26,6 @@
 
 # Use this file in conjunction with docker-compose.core.yml.
 
-version: '3.7'
-
 services:
   workflow-manager:
     secrets: [user_properties]
diff --git a/integration_tests/Dockerfile b/integration_tests/Dockerfile
index 78d36aba..6431bc02 100644
--- a/integration_tests/Dockerfile
+++ b/integration_tests/Dockerfile
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.2
+# syntax=docker/dockerfile:1.20
 
 #############################################################################
 # NOTICE                                                                    #
@@ -31,7 +31,7 @@ ARG BUILD_TAG=latest
 
 
 # Separate stage so we don't have to re-download things when openmpf_build changes
-FROM ubuntu:20.04 as download_dependencies
+FROM ubuntu:24.04 AS download_dependencies
 
 SHELL ["/bin/bash", "-o", "errexit", "-o", "pipefail", "-c"]
 
@@ -39,7 +39,7 @@ RUN --mount=type=tmpfs,target=/var/cache/apt \
     --mount=type=tmpfs,target=/var/lib/apt/lists  \
     --mount=type=tmpfs,target=/tmp \
     apt-get update; \
-    apt-get install --no-install-recommends -y openjdk-17-jre-headless wget ca-certificates patch;
+    apt-get install --no-install-recommends -y openjdk-25-jre-headless wget ca-certificates;
 
 
 RUN mkdir /scripts; \
@@ -58,7 +58,7 @@ RUN mvn dependency:get -Dartifact=org.apache.maven.plugins:maven-surefire-plugin
 
 
 
-FROM ${BUILD_REGISTRY}openmpf_build:${BUILD_TAG} as integration_tests
+FROM ${BUILD_REGISTRY}openmpf_build:${BUILD_TAG} AS integration_tests
 
 SHELL ["/bin/bash", "-o", "errexit", "-o", "pipefail", "-c"]
 
@@ -77,7 +77,7 @@ COPY --from=download_dependencies /scripts/wait-for-it.sh /scripts/wait-for-it.s
 
 ENV THIS_MPF_NODE=workflow-manager
 
-ENV MPF_HOME /opt/mpf
+ENV MPF_HOME=/opt/mpf
 
 RUN ln --symbolic /home/mpf/openmpf-projects/openmpf/trunk/install "$MPF_HOME"
 
@@ -91,7 +91,7 @@ ENV PATH=$PATH:$MPF_HOME/bin
 ENV WFM_BASE_URL=http://localhost:8181
 # Default for JDBC configuration. Can be overridden at runtime.
 ENV JDBC_URL=jdbc:postgresql://db:5432/mpf
-ENV PYTHONUNBUFFERED 1
+ENV PYTHONUNBUFFERED=1
 
 COPY check-test-reports.py /scripts/check-test-reports.py
 COPY docker-entrypoint.sh /scripts/docker-entrypoint.sh
diff --git a/markup/Dockerfile b/markup/Dockerfile
index 4ba44284..65427084 100644
--- a/markup/Dockerfile
+++ b/markup/Dockerfile
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.2
+# syntax=docker/dockerfile:1.20
 
 #############################################################################
 # NOTICE                                                                    #
@@ -31,7 +31,7 @@ ARG BUILD_TAG=latest
 FROM ${BUILD_REGISTRY}openmpf_build:${BUILD_TAG} AS openmpf_build
 
 
-FROM ubuntu:20.04 AS common
+FROM ubuntu:24.04 AS common
 
 SHELL ["/bin/bash", "-o", "errexit", "-o", "pipefail", "-c"]
 
@@ -44,8 +44,8 @@ RUN --mount=type=tmpfs,target=/var/cache/apt \
     apt-get update; \
     apt-get upgrade -y; \
     apt-get install --no-install-recommends -y \
-        openjdk-17-jre-headless wget \
-        libavcodec58 libavformat58 libswscale5;
+        openjdk-25-jre-headless wget \
+        libavcodec60 libavformat60 libswscale7;
 
 COPY --from=openmpf_build /usr/local/bin/ffmpeg /usr/local/bin/ffprobe /usr/local/bin/
 
diff --git a/openmpf_build/Dockerfile b/openmpf_build/Dockerfile
index 0abb55a7..87c6842b 100644
--- a/openmpf_build/Dockerfile
+++ b/openmpf_build/Dockerfile
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.4
+# syntax=docker/dockerfile:1.20
 
 #############################################################################
 # NOTICE                                                                    #
@@ -26,7 +26,7 @@
 # limitations under the License.                                            #
 #############################################################################
 
-FROM ubuntu:20.04 AS apt_install
+FROM ubuntu:24.04 AS apt_install
 
 SHELL ["/bin/bash", "-o", "errexit", "-o", "pipefail", "-c"]
 
@@ -42,50 +42,47 @@ ENV PIP_COMPILE=0
 
 RUN --mount=type=tmpfs,target=/var/cache/apt \
     --mount=type=tmpfs,target=/var/lib/apt/lists  \
-    --mount=type=tmpfs,target=/tmp \
-    apt-get update; \
-    apt-get upgrade -y; \
+    --mount=type=tmpfs,target=/tmp <<eot
+    apt-get update
+    apt-get upgrade -y
     DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
-        wget ca-certificates gnupg2 unzip xz-utils cmake make g++ libgtest-dev mediainfo libssl-dev \
-        liblog4cxx-dev libboost-dev file openjdk-17-jdk-headless libgl1-mesa-glx \
-        # libheif build deps
-        libde265-dev git nasm ninja-build pkg-config \
-        # OpenCV build deps
+        wget ca-certificates gnupg2 unzip cmake make g++ file \
+        libssl-dev libgtest-dev liblog4cxx-dev libboost-dev \
+        openjdk-25-jdk-headless python3.12-dev python3.12-venv libgl1 \
         libopenblas-dev liblapacke-dev libavcodec-dev libavcodec-extra libavformat-dev  \
-        libavutil-dev libswscale-dev libavresample-dev libharfbuzz-dev libfreetype-dev \
-        # Python build deps
-        libsqlite3-dev libreadline-dev libbz2-dev liblzma-dev; \
-    # Can't set up cuda repo at the beginning because it requires wget ca-certificates gnupg2
-    wget -O- https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/3bf863cc.pub \
-        | apt-key add -; \
-    echo "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64 /" \
-        > /etc/apt/sources.list.d/cuda.list; \
-    apt-get update; \
-    apt-get install -y --no-install-recommends cuda-minimal-build-11-4 libcufft-dev-11-4 \
-        libnpp-dev-11-4 libcudnn8-dev=8.2.4.15-1+cuda11.4 libcudnn8=8.2.4.15-1+cuda11.4 \
-        libcublas-dev-11-4; \
-    # OpenCV doesn't use the statically compiled CUDA libraries except for libcudart and they are relatively large.
-    find /usr/local/cuda/lib64/ -name '*.a' -not -name 'libcudart_static.a' -delete; \
-    rm /usr/lib/x86_64-linux-gnu/libcudnn*.a; \
-    ln --symbolic /usr/include/x86_64-linux-gnu/openblas-pthread/cblas.h /usr/include/cblas.h; \
-    ln --symbolic /usr/bin/cmake /usr/bin/cmake3;
+        libavutil-dev libswscale-dev libharfbuzz-dev libfreetype-dev \
+        libde265-dev git nasm ninja-build pkg-config
+
+    # Cannot set up cuda repo at the beginning because it requires wget ca-certificates gnupg2
+    wget -O- https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2404/x86_64/3bf863cc.pub \
+        | apt-key add -
+    echo "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2404/x86_64 /" \
+        > /etc/apt/sources.list.d/cuda.list
+    apt-get update
+    apt-get install -y --no-install-recommends cuda-minimal-build-12-9 libcufft-dev-12-9 \
+        libnpp-dev-12-9 libcublas-dev-12-9 libcudnn9-dev-cuda-12
+
+    # OpenCV does not use the statically compiled CUDA libraries except for libcudart and they are relatively large.
+    find /usr/local/cuda/lib64/ -name '*.a' -not -name libcudart_static.a -delete
+    ln --symbolic /usr/include/x86_64-linux-gnu/openblas-pthread/cblas.h /usr/include/cblas.h
+    ln --symbolic /usr/bin/cmake /usr/bin/cmake3
+eot
 
 
 FROM apt_install AS ocv_install
 
-RUN --mount=type=tmpfs,target=/tmp \
-    mkdir /tmp/opencv-contrib; \
-    wget -O- 'https://github.com/opencv/opencv_contrib/archive/4.9.0.tar.gz' \
-        | tar --extract --gzip --directory /tmp/opencv-contrib; \
-    mkdir /tmp/opencv; \
-    cd  /tmp/opencv; \
-    wget -O- 'https://github.com/opencv/opencv/archive/4.9.0.tar.gz' \
-        | tar --extract --gzip; \
-    cd opencv-4.9.0; \
-    mkdir build; \
-    cd build; \
-    export OpenBLAS_HOME=/usr/lib/x86_64-linux-gnu/openblas-pthread; \
-    cmake -DCMAKE_INSTALL_PREFIX:PATH='/opt/opencv-4.9.0' \
+RUN --mount=type=tmpfs,target=/tmp <<eot
+    mkdir /tmp/opencv-contrib
+    wget -O- https://github.com/opencv/opencv_contrib/archive/refs/tags/4.13.0.tar.gz \
+        | tar --extract --gzip --directory /tmp/opencv-contrib
+    mkdir /tmp/opencv
+    cd /tmp/opencv
+    wget -O- https://github.com/opencv/opencv/archive/refs/tags/4.13.0.tar.gz \
+        | tar --extract --gzip
+    cd opencv-4.13.0
+    mkdir build
+    cd build
+    cmake -DCMAKE_INSTALL_PREFIX:PATH=/opt/opencv-4.13.0 \
         -DCMAKE_BUILD_TYPE=Release \
         -DWITH_IPP=false \
         -DBUILD_EXAMPLES=false \
@@ -98,44 +95,23 @@ RUN --mount=type=tmpfs,target=/tmp \
         -DWITH_CUDNN=true \
         -DOPENCV_DNN_CUDA=true \
         -DBUILD_CUDA_STUBS=true \
-        -DOPENCV_EXTRA_MODULES_PATH=/tmp/opencv-contrib/opencv_contrib-4.9.0/modules \
-        ..; \
-    make --jobs "$(nproc)" install/strip; \
-    ln --symbolic '/opt/opencv-4.9.0/include/opencv4/opencv2' /usr/local/include/opencv2;
-
-
-FROM apt_install AS python_install
-
-RUN --mount=type=tmpfs,target=/tmp <<eot
-    mkdir /tmp/python
-    cd /tmp/python
-    wget -O- 'https://www.python.org/ftp/python/3.12.12/Python-3.12.12.tar.xz' | tar --extract --xz
-    cd Python-3.12.12
-    ./configure --enable-optimizations --with-lto --enable-shared --disable-test-modules --without-static-libpython
-    make --jobs "$(nproc)"
-    make install
-    ln --symbolic /usr/local/lib/libpython3.12.so.1.0 /lib/x86_64-linux-gnu/libpython3.12.so.1.0
-
-    # find command taken from official Python Dockerfile
-    find /usr/local/lib/python3.12 -depth \
-		\( \
-			\( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \
-			-o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name 'libpython*.a' \) \) \
-		\) -exec rm -rf '{}' + ;
+        -DOPENCV_EXTRA_MODULES_PATH=/tmp/opencv-contrib/opencv_contrib-4.13.0/modules \
+        ..
+    make --jobs "$(nproc)" install/strip
+    ln --symbolic /opt/opencv-4.13.0/include/opencv4/opencv2 /usr/local/include/opencv2
 eot
 
 
-
 FROM apt_install
 
 RUN --mount=type=tmpfs,target=/tmp <<eot
     mkdir /tmp/abseil
-    wget -O- 'https://github.com/abseil/abseil-cpp/releases/download/20240722.0/abseil-cpp-20240722.0.tar.gz' \
+    wget -O- https://github.com/abseil/abseil-cpp/releases/download/20240722.0/abseil-cpp-20240722.0.tar.gz \
         | tar --extract --gzip --directory /tmp/abseil;
 
     mkdir /tmp/protobuf
     cd /tmp/protobuf
-    wget -O- 'https://github.com/protocolbuffers/protobuf/releases/download/v28.3/protobuf-28.3.tar.gz' \
+    wget -O- https://github.com/protocolbuffers/protobuf/releases/download/v28.3/protobuf-28.3.tar.gz \
         | tar --extract --gzip;
 
     cd protobuf-28.3
@@ -151,78 +127,63 @@ RUN --mount=type=tmpfs,target=/tmp <<eot
     cmake --install . --strip
 eot
 
-RUN --mount=type=tmpfs,target=/tmp \
-    mkdir /tmp/activemq-cpp; \
-    cd /tmp/activemq-cpp; \
+
+RUN --mount=type=tmpfs,target=/tmp <<eot
+    mkdir /tmp/activemq-cpp
+    cd /tmp/activemq-cpp
     wget -O- https://dlcdn.apache.org/activemq/activemq-cpp/3.9.5/activemq-cpp-library-3.9.5-src.tar.gz \
-        | tar --extract --gzip; \
-    cd activemq-cpp-library-3.9.5; \
-    ./configure; \
-    make --jobs "$(nproc)" install-strip;
+        | tar --extract --gzip
+    cd activemq-cpp-library-3.9.5
+    ./configure
+    make --jobs "$(nproc)" install-strip
+eot
+
 
-RUN wget -O- 'https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz' \
-        | tar --extract --xz --directory /usr/local/bin --strip-components 1 --wildcards \
-            'ffmpeg-*-amd64-static/ffmpeg' 'ffmpeg-*-amd64-static/ffprobe';
+RUN wget -O- https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2026-04-07-13-13/ffmpeg-n8.1-7-ga3475e2554-linux64-gpl-8.1.tar.xz \
+        | tar --extract --xz --directory /usr/local/bin --strip-components 2 --wildcards \
+            '*'/bin/{ffmpeg,ffprobe}
 
 
-RUN --mount=type=tmpfs,target=/tmp \
-    mkdir /tmp/pngdefry; \
-    cd /tmp/pngdefry; \
-    wget -O- 'https://github.com/openmpf/pngdefry/archive/v1.2.tar.gz' \
-        | tar --extract --gzip; \
-    cd pngdefry-1.2; \
-    gcc pngdefry.c -o /usr/local/bin/pngdefry;
+
+RUN --mount=type=tmpfs,target=/tmp <<eot
+    mkdir /tmp/pngdefry
+    cd /tmp/pngdefry
+    wget -O- https://github.com/openmpf/pngdefry/archive/v1.2.tar.gz | tar --extract --gzip
+    cd pngdefry-1.2
+    gcc pngdefry.c -o /usr/local/bin/pngdefry
+eot
 
 
-RUN wget -O- 'https://archive.apache.org/dist/maven/maven-3/3.3.3/binaries/apache-maven-3.3.3-bin.tar.gz' \
+RUN wget -O- https://archive.apache.org/dist/maven/maven-3/3.3.3/binaries/apache-maven-3.3.3-bin.tar.gz \
         | tar --extract --gzip --directory /opt; \
     ln --symbolic /opt/apache-maven-3.3.3/bin/mvn /usr/local/bin;
 
 
-RUN --mount=type=tmpfs,target=/tmp \
-    mkdir /tmp/libheif; \
-    cd /tmp/libheif; \
+RUN --mount=type=tmpfs,target=/tmp <<eot
+    mkdir /tmp/libheif
+    cd /tmp/libheif
     wget -O- https://github.com/strukturag/libheif/archive/refs/tags/v1.20.2.tar.gz \
-        | tar --extract --gzip; \
-    cd libheif-1.20.2/third-party; \
-    bash aom.cmd; \
-    cd ..; \
-    mkdir build; \
-    cd build; \
-    PKG_CONFIG_PATH="/tmp/libheif/libheif-1.20.2/third-party/aom/dist/lib/pkgconfig" \
-        cmake3 -DCMAKE_INSTALL_PREFIX=/usr -DWITH_EXAMPLES=false -DWITH_AOM_DECODER=true -DENABLE_PLUGIN_LOADING=false -DCMAKE_BUILD_TYPE=Release ..; \
-    make --jobs "$(nproc)" install/strip; \
-    cp heifio/libheifio.a /usr/lib64; \
-    cd ../heifio; \
-    mkdir -p /usr/include/libheif/heifio; \
-    cp *.h /usr/include/libheif/heifio;
-
-
-COPY --from=ocv_install /opt/opencv-4.9.0 /opt/opencv-4.9.0
-
-RUN ln --symbolic '/opt/opencv-4.9.0/include/opencv4/opencv2' /usr/local/include/opencv2;
-
-
-COPY --from=python_install \
-    /usr/local/bin/python3.12 /usr/local/bin/python3.12-config \
-    /usr/local/bin/pip3.12 /usr/local/bin/pip3 \
-    /usr/local/bin/
-
-COPY --from=python_install /usr/local/lib/python3.12 /usr/local/lib/python3.12
-
-COPY --from=python_install /usr/local/lib/libpython3.12.so.1.0 /usr/local/lib/
+        | tar --extract --gzip
+    cd libheif-1.20.2/third-party
+    bash aom.cmd
+    cd ..
+    mkdir build
+    cd build
+    PKG_CONFIG_PATH=/tmp/libheif/libheif-1.20.2/third-party/aom/dist/lib/pkgconfig cmake \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DWITH_EXAMPLES=false \
+        -DWITH_AOM_DECODER=true \
+        -DENABLE_PLUGIN_LOADING=false \
+        -DCMAKE_BUILD_TYPE=Release ..
+    make --jobs "$(nproc)" install/strip
+    cp heifio/libheifio.a /usr/lib64
+    mkdir -p /usr/include/libheif/heifio
+    cp ../heifio/*.h /usr/include/libheif/heifio
+eot
 
-# The Python headers are needed to build Python libraries with C extensions.
-COPY --from=python_install /usr/local/include/python3.12 /usr/local/include/python3.12
+COPY --from=ocv_install /opt/opencv-4.13.0 /opt/opencv-4.13.0
 
-RUN <<eot
-    cd /usr/local/bin
-    ln --symbolic python3.12 python3
-    ln --symbolic python3.12-config python3-config
-    cd /usr/local/lib
-    ln --symbolic libpython3.12.so.1.0 libpython3.12.so
-    ln --symbolic /usr/local/lib/libpython3.12.so.1.0 /lib/x86_64-linux-gnu/libpython3.12.so.1.0
-eot
+RUN ln --symbolic /opt/opencv-4.13.0/include/opencv4/opencv2 /usr/local/include/opencv2
 
 COPY . /home/mpf/openmpf-projects
 
@@ -235,6 +196,7 @@ ENV MPF_HOME=/home/mpf/openmpf-projects/openmpf/trunk/install
 
 WORKDIR /home/mpf/openmpf-projects/openmpf
 
+
 RUN --mount=type=cache,id=mvn_cache,target=/root/.m2/repository,sharing=private \
     --mount=type=tmpfs,target=/tmp \
     --mount=type=tmpfs,target=/root/.cache \
@@ -250,19 +212,13 @@ RUN --mount=type=cache,id=mvn_cache,target=/root/.m2/repository,sharing=private
 
 
 ARG RUN_TESTS=false
-RUN \[ "${RUN_TESTS,,}" = true ] || exit 0; \
-    export LD_LIBRARY_PATH=$MPF_HOME/lib:LD_LIBRARY_PATH; \
-    # Use nullglob to avoid entering for loop when no glob matches.
-    # Use globstar to enable ** globs.
-    shopt -s nullglob globstar; \
-    for build_root in /root/mpf-component-build /home/mpf/openmpf-projects/openmpf/trunk/build; do \
-        cd "$build_root"; \
-        for test_executable in **/test/*Test; do \
-            cd "$(dirname "$test_executable")"; \
-            ./"$(basename "$test_executable")"; \
-            cd "$build_root"; \
-        done; \
-    done;
+RUN <<eot
+    if [ "${RUN_TESTS,,}" = true ]; then
+        LD_LIBRARY_PATH="$MPF_HOME/lib:$LD_LIBRARY_PATH" find \
+            /root/mpf-component-build /home/mpf/openmpf-projects/openmpf/trunk/build \
+            -wholename '**/test/*Test' -execdir '{}' \;
+    fi
+eot
 
 WORKDIR /build-artifacts
 
diff --git a/subject-components/python/Dockerfile b/subject-components/python/Dockerfile
index d7a3d406..f047759f 100644
--- a/subject-components/python/Dockerfile
+++ b/subject-components/python/Dockerfile
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.4
+# syntax=docker/dockerfile:1.20
 
 #############################################################################
 # NOTICE                                                                    #
@@ -31,7 +31,7 @@ ARG BUILD_TAG=latest
 FROM ${BUILD_REGISTRY}openmpf_build:${BUILD_TAG} AS openmpf_build
 
 
-FROM ubuntu:20.04 AS common
+FROM ubuntu:24.04 AS common
 
 SHELL ["/bin/bash", "-o", "errexit", "-o", "pipefail", "-c"]
 
@@ -40,33 +40,10 @@ ENV LC_ALL=C.UTF-8
 
 RUN --mount=type=tmpfs,target=/var/cache/apt \
     --mount=type=tmpfs,target=/var/lib/apt/lists  \
-    --mount=type=tmpfs,target=/tmp \
-<<eot
+    --mount=type=tmpfs,target=/tmp <<eot
     apt-get update
     apt-get upgrade -y
-    apt-get install --no-install-recommends -y tini libgl1-mesa-glx libglib2.0-0 ca-certificates
-eot
-
-
-COPY --from=openmpf_build \
-    /usr/local/bin/python3.12 /usr/local/bin/python3.12-config \
-    /usr/local/bin/pip3.12 /usr/local/bin/pip3 \
-    /usr/local/bin/
-
-COPY --from=openmpf_build /usr/local/lib/python3.12 /usr/local/lib/python3.12
-
-COPY --from=openmpf_build /usr/local/lib/libpython3.12.so.1.0 /usr/local/lib/
-
-# The Python headers are needed to build Python libraries with C extensions.
-COPY --from=openmpf_build /usr/local/include/python3.12 /usr/local/include/python3.12
-
-RUN <<eot
-    cd /usr/local/bin
-    ln --symbolic python3.12 python3
-    ln --symbolic python3.12-config python3-config
-    cd /usr/local/lib
-    ln --symbolic libpython3.12.so.1.0 libpython3.12.so
-    ln --symbolic /usr/local/lib/libpython3.12.so.1.0 /lib/x86_64-linux-gnu/libpython3.12.so.1.0
+    apt-get install --no-install-recommends -y tini libgl1 libglib2.0-0 ca-certificates python3
 eot
 
 ENV MPF_HOME=/opt/mpf
@@ -76,24 +53,23 @@ ENV COMPONENT_VIRTUALENV=$MPF_HOME/plugin-venv
 # Adding $COMPONENT_VIRTUALENV/bin to the front of $PATH persistently activates the virtualenv.
 ENV PATH=$COMPONENT_VIRTUALENV/bin:/scripts:$PATH
 
-#########################################
+
+
 FROM common AS build
 
 # The subject component executor depends on the python-qpid-proton pip package.
 # python-qpid-proton requires a C compiler and the Python headers to be installed.
 RUN --mount=type=tmpfs,target=/var/cache/apt \
     --mount=type=tmpfs,target=/var/lib/apt/lists  \
-    --mount=type=tmpfs,target=/tmp \
-<<eot
+    --mount=type=tmpfs,target=/tmp <<eot
     apt-get update
-    apt-get install --no-install-recommends -y gcc libc6-dev
+    apt-get install --no-install-recommends -y gcc libc6-dev python3.12-venv python3.12-dev
 eot
 
 RUN <<eot
     python3 -m venv "$COMPONENT_VIRTUALENV"
     pip config --site set global.no-cache-dir true
     pip install --upgrade pip
-    pip install --upgrade setuptools
 eot
 
 RUN --mount=from=openmpf_build,source=/home/mpf/openmpf-projects/openmpf-python-component-sdk/detection,target=/tmp/python,rw \
@@ -112,7 +88,7 @@ WORKDIR $SRC_DIR
 COPY install-component.sh /scripts/
 
 
-#########################################
+
 FROM common AS executor
 
 ENV MPF_HOME=/opt/mpf
diff --git a/workflow_manager/Dockerfile b/workflow_manager/Dockerfile
index 05d8d9ce..4cb7e785 100644
--- a/workflow_manager/Dockerfile
+++ b/workflow_manager/Dockerfile
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.4
+# syntax=docker/dockerfile:1.20
 
 #############################################################################
 # NOTICE                                                                    #
@@ -31,7 +31,7 @@ ARG BUILD_TAG=latest
 FROM ${BUILD_REGISTRY}openmpf_build:${BUILD_TAG} AS openmpf_build
 
 
-FROM ubuntu:20.04 AS common
+FROM ubuntu:24.04 AS common
 
 SHELL ["/bin/bash", "-o", "errexit", "-o", "pipefail", "-c"]
 
@@ -45,30 +45,13 @@ RUN --mount=type=tmpfs,target=/var/cache/apt \
     apt-get update; \
     apt-get upgrade -y; \
     apt-get install --no-install-recommends -y \
-        openjdk-17-jre-headless libtcnative-1 file wget ca-certificates;
+        openjdk-25-jre-headless libtcnative-1 file wget ca-certificates python3-pip;
 
 
 RUN wget --directory-prefix /scripts \
         https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh; \
     chmod +x /scripts/wait-for-it.sh;
 
-COPY --from=openmpf_build \
-    /usr/local/bin/python3.12 /usr/local/bin/python3.12-config \
-    /usr/local/bin/pip3.12 /usr/local/bin/pip3 \
-    /usr/local/bin/
-
-COPY --from=openmpf_build /usr/local/lib/python3.12 /usr/local/lib/python3.12
-
-COPY --from=openmpf_build /usr/local/lib/libpython3.12.so.1.0 /usr/local/lib/
-
-RUN <<eot
-    cd /usr/local/bin
-    ln --symbolic python3.12 python3
-    ln --symbolic python3.12-config python3-config
-    cd /usr/local/lib
-    ln --symbolic libpython3.12.so.1.0 libpython3.12.so
-    ln --symbolic /usr/local/lib/libpython3.12.so.1.0 /lib/x86_64-linux-gnu/libpython3.12.so.1.0
-eot
 
 COPY --from=openmpf_build /usr/local/bin/ffmpeg /usr/local/bin/ffprobe /usr/local/bin/
 
@@ -95,13 +78,15 @@ RUN <<eot
     cd /build-artifacts/workflow-manager/WEB-INF
     mv jni-libs tmp-jni-libs
     mkdir jni-libs
-    mv tmp-jni-libs/libmpfopencvjni.so jni-libs/
+
+    mv tmp-jni-libs/{libmpfopencvjni.so,libmpfheifjni.so} jni-libs/
     /scripts/copy_libs.sh jni-libs/libmpfopencvjni.so jni-libs tmp-jni-libs
-    mv tmp-jni-libs/libmpfheifjni.so jni-libs/
     /scripts/copy_libs.sh jni-libs/libmpfheifjni.so jni-libs tmp-jni-libs
+
     rm -r tmp-jni-libs
 eot
 
+
 FROM common
 
 COPY --from=copy_libs /build-artifacts/workflow-manager $MPF_HOME/workflow-manager