diff --git a/matlab-deps/r2019b/aws-batch/Dockerfile b/matlab-deps/r2019b/aws-batch/Dockerfile
index e6191af..e3a7ff8 100755
--- a/matlab-deps/r2019b/aws-batch/Dockerfile
+++ b/matlab-deps/r2019b/aws-batch/Dockerfile
@@ -2,7 +2,7 @@
 
 FROM nvidia/cuda:11.8.0-base-ubuntu18.04
 
-LABEL maintainer="The MathWorks"
+LABEL maintainer="The MathWorks, Inc."
 
 ENV DEBIAN_FRONTEND="noninteractive" TZ="Etc/UTC"
 
diff --git a/matlab-deps/r2019b/ubuntu18.04/Dockerfile b/matlab-deps/r2019b/ubuntu18.04/Dockerfile
index db3602e..45dacdd 100755
--- a/matlab-deps/r2019b/ubuntu18.04/Dockerfile
+++ b/matlab-deps/r2019b/ubuntu18.04/Dockerfile
@@ -2,7 +2,7 @@
 
 FROM ubuntu:18.04
 
-LABEL maintainer="The MathWorks"
+LABEL maintainer="The MathWorks, Inc."
 
 ENV DEBIAN_FRONTEND="noninteractive" TZ="Etc/UTC"
 
diff --git a/matlab-deps/r2020a/aws-batch/Dockerfile b/matlab-deps/r2020a/aws-batch/Dockerfile
index 596917a..ddddd49 100644
--- a/matlab-deps/r2020a/aws-batch/Dockerfile
+++ b/matlab-deps/r2020a/aws-batch/Dockerfile
@@ -2,7 +2,7 @@
 
 FROM nvidia/cuda:11.8.0-base-ubuntu18.04
 
-LABEL maintainer="The MathWorks"
+LABEL maintainer="The MathWorks, Inc."
 
 ENV DEBIAN_FRONTEND="noninteractive" TZ="Etc/UTC"
 
diff --git a/matlab-deps/r2020a/ubuntu18.04/Dockerfile b/matlab-deps/r2020a/ubuntu18.04/Dockerfile
index db3602e..45dacdd 100644
--- a/matlab-deps/r2020a/ubuntu18.04/Dockerfile
+++ b/matlab-deps/r2020a/ubuntu18.04/Dockerfile
@@ -2,7 +2,7 @@
 
 FROM ubuntu:18.04
 
-LABEL maintainer="The MathWorks"
+LABEL maintainer="The MathWorks, Inc."
 
 ENV DEBIAN_FRONTEND="noninteractive" TZ="Etc/UTC"
 
diff --git a/matlab-deps/r2020b/aws-batch/Dockerfile b/matlab-deps/r2020b/aws-batch/Dockerfile
index 2699a85..3607442 100644
--- a/matlab-deps/r2020b/aws-batch/Dockerfile
+++ b/matlab-deps/r2020b/aws-batch/Dockerfile
@@ -2,7 +2,7 @@
 
 FROM nvidia/cuda:11.8.0-base-ubuntu20.04
 
-LABEL maintainer="The MathWorks"
+LABEL maintainer="The MathWorks, Inc."
 
 ENV DEBIAN_FRONTEND="noninteractive" TZ="Etc/UTC"
 
diff --git a/matlab-deps/r2020b/ubuntu20.04/Dockerfile b/matlab-deps/r2020b/ubuntu20.04/Dockerfile
index bfdf718..31e2f78 100644
--- a/matlab-deps/r2020b/ubuntu20.04/Dockerfile
+++ b/matlab-deps/r2020b/ubuntu20.04/Dockerfile
@@ -2,7 +2,7 @@
 
 FROM ubuntu:20.04
 
-LABEL maintainer="The MathWorks"
+LABEL maintainer="The MathWorks, Inc."
 
 ENV DEBIAN_FRONTEND="noninteractive" TZ="Etc/UTC"
 
diff --git a/matlab-deps/r2021a/aws-batch/Dockerfile b/matlab-deps/r2021a/aws-batch/Dockerfile
index b9d1595..8450167 100644
--- a/matlab-deps/r2021a/aws-batch/Dockerfile
+++ b/matlab-deps/r2021a/aws-batch/Dockerfile
@@ -2,7 +2,7 @@
 
 FROM nvidia/cuda:11.8.0-base-ubuntu20.04
 
-LABEL maintainer="The MathWorks"
+LABEL maintainer="The MathWorks, Inc."
 
 ENV DEBIAN_FRONTEND="noninteractive" TZ="Etc/UTC"
 
diff --git a/matlab-deps/r2021a/ubuntu20.04/Dockerfile b/matlab-deps/r2021a/ubuntu20.04/Dockerfile
index 8e9837b..d1340fc 100644
--- a/matlab-deps/r2021a/ubuntu20.04/Dockerfile
+++ b/matlab-deps/r2021a/ubuntu20.04/Dockerfile
@@ -2,7 +2,7 @@
 
 FROM ubuntu:20.04
 
-LABEL maintainer="The MathWorks"
+LABEL maintainer="The MathWorks, Inc."
 
 ENV DEBIAN_FRONTEND="noninteractive" TZ="Etc/UTC"
 
diff --git a/matlab-deps/r2021b/aws-batch/Dockerfile b/matlab-deps/r2021b/aws-batch/Dockerfile
index 09dcb9d..f12384b 100644
--- a/matlab-deps/r2021b/aws-batch/Dockerfile
+++ b/matlab-deps/r2021b/aws-batch/Dockerfile
@@ -2,7 +2,7 @@
 
 FROM nvidia/cuda:11.8.0-base-ubuntu20.04
 
-LABEL maintainer="The MathWorks"
+LABEL maintainer="The MathWorks, Inc."
 
 ENV DEBIAN_FRONTEND="noninteractive" TZ="Etc/UTC"
 
diff --git a/matlab-deps/r2021b/ubi8/Dockerfile b/matlab-deps/r2021b/ubi8/Dockerfile
index 928233a..d250f84 100644
--- a/matlab-deps/r2021b/ubi8/Dockerfile
+++ b/matlab-deps/r2021b/ubi8/Dockerfile
@@ -1,7 +1,7 @@
 # Copyright 2021 The MathWorks, Inc.
 FROM registry.access.redhat.com/ubi8/ubi:8.5-226
 
-LABEL maintainer="The MathWorks"
+LABEL maintainer="The MathWorks, Inc."
 
 ENV TZ="Etc/UTC"
 
diff --git a/matlab-deps/r2021b/ubuntu20.04/Dockerfile b/matlab-deps/r2021b/ubuntu20.04/Dockerfile
index c850b52..9b5809d 100644
--- a/matlab-deps/r2021b/ubuntu20.04/Dockerfile
+++ b/matlab-deps/r2021b/ubuntu20.04/Dockerfile
@@ -1,7 +1,7 @@
 # Copyright 2021 The MathWorks, Inc.
 FROM ubuntu:20.04
 
-LABEL maintainer="The MathWorks"
+LABEL maintainer="The MathWorks, Inc."
 
 ENV DEBIAN_FRONTEND="noninteractive" TZ="Etc/UTC"
 
diff --git a/matlab-deps/r2022a/aws-batch/Dockerfile b/matlab-deps/r2022a/aws-batch/Dockerfile
index 09dcb9d..f12384b 100644
--- a/matlab-deps/r2022a/aws-batch/Dockerfile
+++ b/matlab-deps/r2022a/aws-batch/Dockerfile
@@ -2,7 +2,7 @@
 
 FROM nvidia/cuda:11.8.0-base-ubuntu20.04
 
-LABEL maintainer="The MathWorks"
+LABEL maintainer="The MathWorks, Inc."
 
 ENV DEBIAN_FRONTEND="noninteractive" TZ="Etc/UTC"
 
diff --git a/matlab-deps/r2022a/ubi8/Dockerfile b/matlab-deps/r2022a/ubi8/Dockerfile
index 778aa80..8aed45a 100644
--- a/matlab-deps/r2022a/ubi8/Dockerfile
+++ b/matlab-deps/r2022a/ubi8/Dockerfile
@@ -1,7 +1,7 @@
 # Copyright 2022 The MathWorks, Inc.
 FROM registry.access.redhat.com/ubi8/ubi:8.5-226
 
-LABEL maintainer="The MathWorks"
+LABEL maintainer="The MathWorks, Inc."
 
 ENV TZ="Etc/UTC"
 
diff --git a/matlab-deps/r2022a/ubuntu20.04/Dockerfile b/matlab-deps/r2022a/ubuntu20.04/Dockerfile
index d080171..70d6862 100644
--- a/matlab-deps/r2022a/ubuntu20.04/Dockerfile
+++ b/matlab-deps/r2022a/ubuntu20.04/Dockerfile
@@ -1,7 +1,7 @@
 # Copyright 2022 The MathWorks, Inc.
 FROM ubuntu:20.04
 
-LABEL maintainer="The MathWorks"
+LABEL maintainer="The MathWorks, Inc."
 
 ENV DEBIAN_FRONTEND="noninteractive" TZ="Etc/UTC"
 
diff --git a/matlab-deps/r2022b/aws-batch/Dockerfile b/matlab-deps/r2022b/aws-batch/Dockerfile
index 8adcc24..0c2be43 100644
--- a/matlab-deps/r2022b/aws-batch/Dockerfile
+++ b/matlab-deps/r2022b/aws-batch/Dockerfile
@@ -2,7 +2,7 @@
 
 FROM nvidia/cuda:11.8.0-base-ubuntu20.04
 
-LABEL maintainer="The MathWorks"
+LABEL maintainer="The MathWorks, Inc."
 
 ENV DEBIAN_FRONTEND="noninteractive" TZ="Etc/UTC"
 
diff --git a/matlab-deps/r2022b/ubi8/Dockerfile b/matlab-deps/r2022b/ubi8/Dockerfile
index bd005a0..d4601e9 100644
--- a/matlab-deps/r2022b/ubi8/Dockerfile
+++ b/matlab-deps/r2022b/ubi8/Dockerfile
@@ -1,7 +1,7 @@
 # Copyright 2022 The MathWorks, Inc.
 FROM registry.access.redhat.com/ubi8/ubi:latest
 
-LABEL maintainer="The MathWorks"
+LABEL maintainer="The MathWorks, Inc."
 
 ENV TZ="Etc/UTC"
 
diff --git a/matlab-deps/r2022b/ubi9/Dockerfile b/matlab-deps/r2022b/ubi9/Dockerfile
index 4f4d8f3..db067d0 100644
--- a/matlab-deps/r2022b/ubi9/Dockerfile
+++ b/matlab-deps/r2022b/ubi9/Dockerfile
@@ -1,7 +1,7 @@
 # Copyright 2023 The MathWorks, Inc.
 FROM registry.access.redhat.com/ubi9/ubi:latest
 
-LABEL maintainer="The MathWorks"
+LABEL maintainer="The MathWorks, Inc."
 
 ENV TZ="Etc/UTC"
 
diff --git a/matlab-deps/r2022b/ubuntu20.04/Dockerfile b/matlab-deps/r2022b/ubuntu20.04/Dockerfile
index d080171..70d6862 100644
--- a/matlab-deps/r2022b/ubuntu20.04/Dockerfile
+++ b/matlab-deps/r2022b/ubuntu20.04/Dockerfile
@@ -1,7 +1,7 @@
 # Copyright 2022 The MathWorks, Inc.
 FROM ubuntu:20.04
 
-LABEL maintainer="The MathWorks"
+LABEL maintainer="The MathWorks, Inc."
 
 ENV DEBIAN_FRONTEND="noninteractive" TZ="Etc/UTC"
 
diff --git a/matlab-deps/r2022b/ubuntu22.04/Dockerfile b/matlab-deps/r2022b/ubuntu22.04/Dockerfile
index 9963b8c..9078495 100644
--- a/matlab-deps/r2022b/ubuntu22.04/Dockerfile
+++ b/matlab-deps/r2022b/ubuntu22.04/Dockerfile
@@ -1,7 +1,7 @@
 # Copyright 2023 The MathWorks, Inc.
 FROM ubuntu:22.04
 
-LABEL maintainer="The MathWorks"
+LABEL maintainer="The MathWorks, Inc."
 
 ENV DEBIAN_FRONTEND="noninteractive" TZ="Etc/UTC"
 
diff --git a/matlab-deps/r2023a/aws-batch/Dockerfile b/matlab-deps/r2023a/aws-batch/Dockerfile
index 1354788..60768d7 100644
--- a/matlab-deps/r2023a/aws-batch/Dockerfile
+++ b/matlab-deps/r2023a/aws-batch/Dockerfile
@@ -2,7 +2,7 @@
 
 FROM nvidia/cuda:11.8.0-base-ubuntu20.04
 
-LABEL maintainer="The MathWorks"
+LABEL maintainer="The MathWorks, Inc."
 
 ENV DEBIAN_FRONTEND="noninteractive" TZ="Etc/UTC"
 
diff --git a/matlab-deps/r2023a/ubi8/Dockerfile b/matlab-deps/r2023a/ubi8/Dockerfile
index 9bbe3c6..f1ff000 100644
--- a/matlab-deps/r2023a/ubi8/Dockerfile
+++ b/matlab-deps/r2023a/ubi8/Dockerfile
@@ -1,7 +1,7 @@
 # Copyright 2023 The MathWorks, Inc.
 FROM registry.access.redhat.com/ubi8/ubi:latest
 
-LABEL maintainer="The MathWorks"
+LABEL maintainer="The MathWorks, Inc."
 
 ENV TZ="Etc/UTC"
 
diff --git a/matlab-deps/r2023a/ubi9/Dockerfile b/matlab-deps/r2023a/ubi9/Dockerfile
index 4f4d8f3..db067d0 100644
--- a/matlab-deps/r2023a/ubi9/Dockerfile
+++ b/matlab-deps/r2023a/ubi9/Dockerfile
@@ -1,7 +1,7 @@
 # Copyright 2023 The MathWorks, Inc.
 FROM registry.access.redhat.com/ubi9/ubi:latest
 
-LABEL maintainer="The MathWorks"
+LABEL maintainer="The MathWorks, Inc."
 
 ENV TZ="Etc/UTC"
 
diff --git a/matlab-deps/r2023a/ubuntu20.04/Dockerfile b/matlab-deps/r2023a/ubuntu20.04/Dockerfile
index 4dba3a1..8a6442b 100644
--- a/matlab-deps/r2023a/ubuntu20.04/Dockerfile
+++ b/matlab-deps/r2023a/ubuntu20.04/Dockerfile
@@ -1,7 +1,7 @@
 # Copyright 2023 The MathWorks, Inc.
 FROM ubuntu:20.04
 
-LABEL maintainer="The MathWorks"
+LABEL maintainer="The MathWorks, Inc."
 
 ENV DEBIAN_FRONTEND="noninteractive" TZ="Etc/UTC"
 
diff --git a/matlab-deps/r2023a/ubuntu22.04/Dockerfile b/matlab-deps/r2023a/ubuntu22.04/Dockerfile
index 9963b8c..9078495 100644
--- a/matlab-deps/r2023a/ubuntu22.04/Dockerfile
+++ b/matlab-deps/r2023a/ubuntu22.04/Dockerfile
@@ -1,7 +1,7 @@
 # Copyright 2023 The MathWorks, Inc.
 FROM ubuntu:22.04
 
-LABEL maintainer="The MathWorks"
+LABEL maintainer="The MathWorks, Inc."
 
 ENV DEBIAN_FRONTEND="noninteractive" TZ="Etc/UTC"
 
diff --git a/matlab-deps/r2023b/aws-batch/Dockerfile b/matlab-deps/r2023b/aws-batch/Dockerfile
index c2a4872..ccd5b1c 100644
--- a/matlab-deps/r2023b/aws-batch/Dockerfile
+++ b/matlab-deps/r2023b/aws-batch/Dockerfile
@@ -2,7 +2,7 @@
 
 FROM nvidia/cuda:11.8.0-base-ubuntu22.04
 
-LABEL maintainer="The MathWorks"
+LABEL maintainer="The MathWorks, Inc."
 
 ENV DEBIAN_FRONTEND="noninteractive" TZ="Etc/UTC"
 
diff --git a/matlab-deps/r2023b/ubi8/Dockerfile b/matlab-deps/r2023b/ubi8/Dockerfile
index 9bbe3c6..f1ff000 100644
--- a/matlab-deps/r2023b/ubi8/Dockerfile
+++ b/matlab-deps/r2023b/ubi8/Dockerfile
@@ -1,7 +1,7 @@
 # Copyright 2023 The MathWorks, Inc.
 FROM registry.access.redhat.com/ubi8/ubi:latest
 
-LABEL maintainer="The MathWorks"
+LABEL maintainer="The MathWorks, Inc."
 
 ENV TZ="Etc/UTC"
 
diff --git a/matlab-deps/r2023b/ubi9/Dockerfile b/matlab-deps/r2023b/ubi9/Dockerfile
index 4f4d8f3..db067d0 100644
--- a/matlab-deps/r2023b/ubi9/Dockerfile
+++ b/matlab-deps/r2023b/ubi9/Dockerfile
@@ -1,7 +1,7 @@
 # Copyright 2023 The MathWorks, Inc.
 FROM registry.access.redhat.com/ubi9/ubi:latest
 
-LABEL maintainer="The MathWorks"
+LABEL maintainer="The MathWorks, Inc."
 
 ENV TZ="Etc/UTC"
 
diff --git a/matlab-deps/r2023b/ubuntu20.04/Dockerfile b/matlab-deps/r2023b/ubuntu20.04/Dockerfile
index 4dba3a1..8a6442b 100644
--- a/matlab-deps/r2023b/ubuntu20.04/Dockerfile
+++ b/matlab-deps/r2023b/ubuntu20.04/Dockerfile
@@ -1,7 +1,7 @@
 # Copyright 2023 The MathWorks, Inc.
 FROM ubuntu:20.04
 
-LABEL maintainer="The MathWorks"
+LABEL maintainer="The MathWorks, Inc."
 
 ENV DEBIAN_FRONTEND="noninteractive" TZ="Etc/UTC"
 
diff --git a/matlab-deps/r2023b/ubuntu22.04/Dockerfile b/matlab-deps/r2023b/ubuntu22.04/Dockerfile
index 4757f38..0da6eeb 100644
--- a/matlab-deps/r2023b/ubuntu22.04/Dockerfile
+++ b/matlab-deps/r2023b/ubuntu22.04/Dockerfile
@@ -1,7 +1,7 @@
 # Copyright 2023 The MathWorks, Inc.
 FROM ubuntu:22.04
 
-LABEL maintainer="The MathWorks"
+LABEL maintainer="The MathWorks, Inc."
 
 ENV DEBIAN_FRONTEND="noninteractive" TZ="Etc/UTC"
 
diff --git a/matlab-deps/r2024a/aws-batch/Dockerfile b/matlab-deps/r2024a/aws-batch/Dockerfile
index 5c57a37..cbd31db 100644
--- a/matlab-deps/r2024a/aws-batch/Dockerfile
+++ b/matlab-deps/r2024a/aws-batch/Dockerfile
@@ -2,7 +2,7 @@
 
 FROM nvidia/cuda:12.2.2-base-ubuntu22.04
 
-LABEL maintainer="The MathWorks"
+LABEL maintainer="The MathWorks, Inc."
 
 ENV DEBIAN_FRONTEND="noninteractive" TZ="Etc/UTC"
 
diff --git a/matlab-deps/r2024a/ubi8/Dockerfile b/matlab-deps/r2024a/ubi8/Dockerfile
index 863ead0..9f5d7f7 100644
--- a/matlab-deps/r2024a/ubi8/Dockerfile
+++ b/matlab-deps/r2024a/ubi8/Dockerfile
@@ -1,7 +1,7 @@
 # Copyright 2024 The MathWorks, Inc.
 FROM registry.access.redhat.com/ubi8/ubi:latest
 
-LABEL maintainer="The MathWorks"
+LABEL maintainer="The MathWorks, Inc."
 
 ENV TZ="Etc/UTC"
 
diff --git a/matlab-deps/r2024a/ubi9/Dockerfile b/matlab-deps/r2024a/ubi9/Dockerfile
index bb4b6f2..5cefe65 100644
--- a/matlab-deps/r2024a/ubi9/Dockerfile
+++ b/matlab-deps/r2024a/ubi9/Dockerfile
@@ -1,7 +1,7 @@
 # Copyright 2024 The MathWorks, Inc.
 FROM registry.access.redhat.com/ubi9/ubi:latest
 
-LABEL maintainer="The MathWorks"
+LABEL maintainer="The MathWorks, Inc."
 
 ENV TZ="Etc/UTC"
 
diff --git a/matlab-deps/r2024a/ubuntu20.04/Dockerfile b/matlab-deps/r2024a/ubuntu20.04/Dockerfile
index 8fbb303..eb01cb7 100644
--- a/matlab-deps/r2024a/ubuntu20.04/Dockerfile
+++ b/matlab-deps/r2024a/ubuntu20.04/Dockerfile
@@ -1,7 +1,7 @@
 # Copyright 2024 The MathWorks, Inc.
 FROM ubuntu:20.04
 
-LABEL maintainer="The MathWorks"
+LABEL maintainer="The MathWorks, Inc."
 
 ENV DEBIAN_FRONTEND="noninteractive" TZ="Etc/UTC"
 
diff --git a/matlab-deps/r2024a/ubuntu22.04/Dockerfile b/matlab-deps/r2024a/ubuntu22.04/Dockerfile
index 584f790..313a699 100644
--- a/matlab-deps/r2024a/ubuntu22.04/Dockerfile
+++ b/matlab-deps/r2024a/ubuntu22.04/Dockerfile
@@ -1,7 +1,7 @@
 # Copyright 2024 The MathWorks, Inc.
 FROM ubuntu:22.04
 
-LABEL maintainer="The MathWorks"
+LABEL maintainer="The MathWorks, Inc."
 
 ENV DEBIAN_FRONTEND="noninteractive" TZ="Etc/UTC"
 
diff --git a/matlab-deps/r2024b/aws-batch/Dockerfile b/matlab-deps/r2024b/aws-batch/Dockerfile
index 5c57a37..cbd31db 100644
--- a/matlab-deps/r2024b/aws-batch/Dockerfile
+++ b/matlab-deps/r2024b/aws-batch/Dockerfile
@@ -2,7 +2,7 @@
 
 FROM nvidia/cuda:12.2.2-base-ubuntu22.04
 
-LABEL maintainer="The MathWorks"
+LABEL maintainer="The MathWorks, Inc."
 
 ENV DEBIAN_FRONTEND="noninteractive" TZ="Etc/UTC"
 
diff --git a/matlab-deps/r2024b/ubi8/Dockerfile b/matlab-deps/r2024b/ubi8/Dockerfile
index 863ead0..9f5d7f7 100644
--- a/matlab-deps/r2024b/ubi8/Dockerfile
+++ b/matlab-deps/r2024b/ubi8/Dockerfile
@@ -1,7 +1,7 @@
 # Copyright 2024 The MathWorks, Inc.
 FROM registry.access.redhat.com/ubi8/ubi:latest
 
-LABEL maintainer="The MathWorks"
+LABEL maintainer="The MathWorks, Inc."
 
 ENV TZ="Etc/UTC"
 
diff --git a/matlab-deps/r2024b/ubi9/Dockerfile b/matlab-deps/r2024b/ubi9/Dockerfile
index bb4b6f2..5cefe65 100644
--- a/matlab-deps/r2024b/ubi9/Dockerfile
+++ b/matlab-deps/r2024b/ubi9/Dockerfile
@@ -1,7 +1,7 @@
 # Copyright 2024 The MathWorks, Inc.
 FROM registry.access.redhat.com/ubi9/ubi:latest
 
-LABEL maintainer="The MathWorks"
+LABEL maintainer="The MathWorks, Inc."
 
 ENV TZ="Etc/UTC"
 
diff --git a/matlab-deps/r2024b/ubuntu20.04/Dockerfile b/matlab-deps/r2024b/ubuntu20.04/Dockerfile
index 8fbb303..eb01cb7 100644
--- a/matlab-deps/r2024b/ubuntu20.04/Dockerfile
+++ b/matlab-deps/r2024b/ubuntu20.04/Dockerfile
@@ -1,7 +1,7 @@
 # Copyright 2024 The MathWorks, Inc.
 FROM ubuntu:20.04
 
-LABEL maintainer="The MathWorks"
+LABEL maintainer="The MathWorks, Inc."
 
 ENV DEBIAN_FRONTEND="noninteractive" TZ="Etc/UTC"
 
diff --git a/matlab-deps/r2024b/ubuntu22.04/Dockerfile b/matlab-deps/r2024b/ubuntu22.04/Dockerfile
index 584f790..313a699 100644
--- a/matlab-deps/r2024b/ubuntu22.04/Dockerfile
+++ b/matlab-deps/r2024b/ubuntu22.04/Dockerfile
@@ -1,7 +1,7 @@
 # Copyright 2024 The MathWorks, Inc.
 FROM ubuntu:22.04
 
-LABEL maintainer="The MathWorks"
+LABEL maintainer="The MathWorks, Inc."
 
 ENV DEBIAN_FRONTEND="noninteractive" TZ="Etc/UTC"
 
diff --git a/polyspace-deps/r2022b/ubuntu20.04/Dockerfile b/polyspace-deps/r2022b/ubuntu20.04/Dockerfile
index daaceac..53381ae 100644
--- a/polyspace-deps/r2022b/ubuntu20.04/Dockerfile
+++ b/polyspace-deps/r2022b/ubuntu20.04/Dockerfile
@@ -1,7 +1,7 @@
 # Copyright 2022 The MathWorks, Inc.
 FROM ubuntu:20.04
 
-LABEL maintainer="The MathWorks"
+LABEL maintainer="The MathWorks, Inc."
 
 ENV DEBIAN_FRONTEND="noninteractive" TZ="Etc/UTC"
 
diff --git a/polyspace-deps/r2023a/ubuntu20.04/Dockerfile b/polyspace-deps/r2023a/ubuntu20.04/Dockerfile
index e4db1df..a90abe8 100644
--- a/polyspace-deps/r2023a/ubuntu20.04/Dockerfile
+++ b/polyspace-deps/r2023a/ubuntu20.04/Dockerfile
@@ -1,7 +1,7 @@
 # Copyright 2023 The MathWorks, Inc.
 FROM ubuntu:20.04
 
-LABEL maintainer="The MathWorks"
+LABEL maintainer="The MathWorks, Inc."
 
 ENV DEBIAN_FRONTEND="noninteractive" TZ="Etc/UTC"
 
diff --git a/polyspace-deps/r2023b/ubuntu22.04/Dockerfile b/polyspace-deps/r2023b/ubuntu22.04/Dockerfile
index 8d494e5..40a0972 100644
--- a/polyspace-deps/r2023b/ubuntu22.04/Dockerfile
+++ b/polyspace-deps/r2023b/ubuntu22.04/Dockerfile
@@ -1,7 +1,7 @@
 # Copyright 2023 The MathWorks, Inc.
 FROM ubuntu:22.04
 
-LABEL maintainer="The MathWorks"
+LABEL maintainer="The MathWorks, Inc."
 
 ENV DEBIAN_FRONTEND="noninteractive" TZ="Etc/UTC"
 
diff --git a/ubi-hardening-extras/almalinux-base/Dockerfile b/ubi-hardening-extras/almalinux-base/Dockerfile
index 1233291..4aba7c1 100644
--- a/ubi-hardening-extras/almalinux-base/Dockerfile
+++ b/ubi-hardening-extras/almalinux-base/Dockerfile
@@ -4,7 +4,7 @@ ARG BASE_TAG=9.4
 
 FROM ${BASE_IMAGE}:${BASE_TAG}
 
-LABEL maintainer="The MathWorks"
+LABEL maintainer="The MathWorks, Inc."
 
 ARG LOCATION_ROOT=/tmp
 
diff --git a/ubi-hardening-extras/icewm/Dockerfile b/ubi-hardening-extras/icewm/Dockerfile
index eca689f..6223411 100644
--- a/ubi-hardening-extras/icewm/Dockerfile
+++ b/ubi-hardening-extras/icewm/Dockerfile
@@ -20,7 +20,7 @@ RUN echo "${VERSION}" > ${LOCATION}.version
 FROM scratch AS export-stage
 ARG LOCATION_ROOT
 
-LABEL maintainer="The MathWorks"
+LABEL maintainer="The MathWorks, Inc."
 
 COPY --from=rpm-install ${LOCATION_ROOT}/*.gz /
 COPY --from=rpm-install ${LOCATION_ROOT}/*.sha256 /
diff --git a/ubi-hardening-extras/novnc/Dockerfile b/ubi-hardening-extras/novnc/Dockerfile
index dad7a08..7cd3edd 100644
--- a/ubi-hardening-extras/novnc/Dockerfile
+++ b/ubi-hardening-extras/novnc/Dockerfile
@@ -24,7 +24,7 @@ RUN echo "${VERSION}" > ${LOCATION}.version
 FROM scratch AS export-stage
 ARG LOCATION_ROOT
 
-LABEL maintainer="The MathWorks"
+LABEL maintainer="The MathWorks, Inc."
 
 COPY --from=rpm-install ${LOCATION_ROOT}/*.gz /
 COPY --from=rpm-install ${LOCATION_ROOT}/*.sha256 /
diff --git a/ubi-hardening-extras/tigervnc/Dockerfile b/ubi-hardening-extras/tigervnc/Dockerfile
index 645469b..a42e023 100644
--- a/ubi-hardening-extras/tigervnc/Dockerfile
+++ b/ubi-hardening-extras/tigervnc/Dockerfile
@@ -20,7 +20,7 @@ RUN echo "${VERSION}" > ${LOCATION}.version
 FROM scratch AS export-stage
 ARG LOCATION_ROOT
 
-LABEL maintainer="The MathWorks"
+LABEL maintainer="The MathWorks, Inc."
 
 COPY --from=rpm-install ${LOCATION_ROOT}/*.gz /
 COPY --from=rpm-install ${LOCATION_ROOT}/*.sha256 /
diff --git a/ubi-hardening-extras/workflow/extraction.Dockerfile b/ubi-hardening-extras/workflow/extraction.Dockerfile
index f76ecf8..c738119 100644
--- a/ubi-hardening-extras/workflow/extraction.Dockerfile
+++ b/ubi-hardening-extras/workflow/extraction.Dockerfile
@@ -5,7 +5,7 @@ FROM ${BASE_IMAGE} as base
 
 FROM scratch AS extract-stage
 
-LABEL maintainer="The MathWorks"
+LABEL maintainer="The MathWorks, Inc."
 
 COPY --from=base /*.sha256 /
 COPY --from=base /*.version /
diff --git a/ubi-hardening-extras/xterm/Dockerfile b/ubi-hardening-extras/xterm/Dockerfile
index 921c600..f272354 100644
--- a/ubi-hardening-extras/xterm/Dockerfile
+++ b/ubi-hardening-extras/xterm/Dockerfile
@@ -20,7 +20,7 @@ RUN echo "${VERSION}" > ${LOCATION}.version
 FROM scratch AS export-stage
 ARG LOCATION_ROOT
 
-LABEL maintainer="The MathWorks"
+LABEL maintainer="The MathWorks, Inc."
 
 COPY --from=rpm-install ${LOCATION_ROOT}/*.gz /
 COPY --from=rpm-install ${LOCATION_ROOT}/*.sha256 /