diff --git a/10.0/aspnet/Dockerfile.rhel9 b/10.0/aspnet/Dockerfile.rhel9
index 91d81f9d..3ff8e4ed 100644
--- a/10.0/aspnet/Dockerfile.rhel9
+++ b/10.0/aspnet/Dockerfile.rhel9
@@ -8,17 +8,20 @@ ARG DOTNET_TARBALL
 # Like Microsoft images, provide the ASP.NET shared framework version.
 ENV ASPNET_VERSION=$ASPNET_VERSION
 
-LABEL io.k8s.description="Platform for running ASP.NET Core 10 applications" \
-      io.k8s.display-name="ASP.NET Core 10" \
-      io.openshift.tags="runtime,.net,dotnet,dotnetcore,aspnet,aspnetcore,dotnet100-aspnet"
-
-# Labels consumed by Red Hat build service
-LABEL name="ubi9/dotnet-100-aspnet" \
-      description="Platform for running ASP.NET Core 10 applications" \
-      summary="ASP.NET Core 10 Runtime" \
-      com.redhat.component="dotnet-100-aspnet-container" \
-      com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI" \
-      aspnet_version="$ASPNET_VERSION"
+ARG _SUMMARY="ASP.NET Core 10 Runtime"
+ARG _DESCRIPTION="Base image for running ASP.NET Core 10.0 applications"
+LABEL \
+      # Labels consumed by Red Hat build pipeline, container catalog and OpenShift
+      name="ubi9/dotnet-100-aspnet" \
+      summary="$_SUMMARY" \
+      description="$_DESCRIPTION" \
+      com.redhat.component="dotnet-container" \
+      io.k8s.display-name="$_SUMMARY" \
+      io.k8s.description="$_DESCRIPTION" \
+      io.openshift.tags="runtime,dotnet,aspnet,aspnetcore,dotnet-100,dotnet-100-aspnet" \
+      aspnet_version="$ASPNET_VERSION" \
+      # UBI EULA
+      com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI"
 
 USER 0
 
diff --git a/10.0/build/Dockerfile.rhel9 b/10.0/build/Dockerfile.rhel9
index c5905335..1062d3f1 100644
--- a/10.0/build/Dockerfile.rhel9
+++ b/10.0/build/Dockerfile.rhel9
@@ -15,19 +15,23 @@ ENV PATH=/opt/app-root/src/.local/bin:/opt/app-root/src/bin:/opt/app-root/.dotne
     # Like Microsoft images, provide the SDK version
     DOTNET_SDK_VERSION=$DOTNET_SDK_VERSION
 
-LABEL io.k8s.description="Platform for building and running .NET 10 applications" \
-      io.k8s.display-name=".NET 10 SDK" \
-      io.openshift.tags="builder,.net,dotnet,dotnetcore,dotnet-100" \
+ARG _SUMMARY=".NET 10 SDK"
+ARG _DESCRIPTION="SDK for building .NET 10.0 applications"
+LABEL \
+      # Labels consumed by Red Hat build pipeline, container catalog and OpenShift
+      name="ubi9/dotnet-100" \
+      summary="$_SUMMARY" \
+      description="$_DESCRIPTION" \
+      com.redhat.component="dotnet-container" \
+      io.k8s.display-name="$_SUMMARY" \
+      io.k8s.description="$_DESCRIPTION" \
+      io.openshift.tags="builder,dotnet,aspnet,aspnetcore,dotnet-100,dotnet-100-sdk" \
+      dotnet_sdk_version="$DOTNET_SDK_VERSION" \
+      # S2I
       io.openshift.s2i.scripts-url=image:///usr/libexec/s2i \
-      io.s2i.scripts-url=image:///usr/libexec/s2i
-
-# Labels consumed by Red Hat build service
-LABEL name="ubi9/dotnet-100" \
-      description="Platform for building and running .NET 10 applications" \
-      summary=".NET 10 SDK" \
-      com.redhat.component="dotnet-100-container" \
-      com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI" \
-      dotnet_sdk_version="$DOTNET_SDK_VERSION"
+      io.s2i.scripts-url=image:///usr/libexec/s2i \
+      # UBI EULA
+      com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI"
 
 # Switch to root for package installs
 USER 0
diff --git a/10.0/runtime/Dockerfile.rhel9 b/10.0/runtime/Dockerfile.rhel9
index c9fd28bf..3598bef4 100644
--- a/10.0/runtime/Dockerfile.rhel9
+++ b/10.0/runtime/Dockerfile.rhel9
@@ -25,19 +25,22 @@ ENV HOME=/opt/app-root \
     # Like Microsoft images, provide the .NET version.
     DOTNET_VERSION=$DOTNET_VERSION
 
-LABEL io.k8s.description="Platform for running .NET 10 applications" \
-      io.k8s.display-name=".NET 10" \
-      io.openshift.tags="runtime,.net,dotnet,dotnetcore,dotnet100-runtime" \
-      io.openshift.expose-services="8080:http"
-
-# Labels consumed by Red Hat build service
-LABEL name="ubi9/dotnet-100-runtime" \
-      description="Platform for running .NET 10 applications" \
-      summary=".NET 10 Runtime" \
-      com.redhat.component="dotnet-100-runtime-container" \
-      com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI" \
+ARG _SUMMARY=".NET 10 Runtime"
+ARG _DESCRIPTION="Base image for running .NET 10.0 applications"
+LABEL \
+      # Labels consumed by Red Hat build pipeline, container catalog and OpenShift
+      name="ubi9/dotnet-100-runtime" \
+      summary="$_SUMMARY" \
+      description="$_DESCRIPTION" \
+      com.redhat.component="dotnet-container" \
+      io.k8s.display-name="$_SUMMARY" \
+      io.k8s.description="$_DESCRIPTION" \
+      io.openshift.tags="runtime,dotnet,dotnet-100,dotnet-100-runtime" \
+      io.openshift.expose-services="8080:http" \
       dotnet_version_major_minor="10.0" \
-      dotnet_version="$DOTNET_VERSION"
+      dotnet_version="$DOTNET_VERSION" \
+      # UBI EULA
+      com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI"
 
 COPY ./root/usr/bin /usr/bin