diff --git a/389-ds-container/Dockerfile b/389-ds-container/Dockerfile
index 9d61c66c6..d386cc6a4 100644
--- a/389-ds-container/Dockerfile
+++ b/389-ds-container/Dockerfile
@@ -22,7 +22,6 @@ FROM suse/sle15:15.6
 
 MAINTAINER william.brown@suse.com
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=com.suse.application.389-ds
 LABEL org.opencontainers.image.title="SLE 389 Directory Server"
 LABEL org.opencontainers.image.description="389 Directory Server container based on the SLE Base Container Image."
diff --git a/alertmanager-image/Dockerfile b/alertmanager-image/Dockerfile
index 3dae2cd60..1367023eb 100644
--- a/alertmanager-image/Dockerfile
+++ b/alertmanager-image/Dockerfile
@@ -22,7 +22,6 @@ FROM suse/sle15:15.6
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=com.suse.application.alertmanager
 LABEL org.opencontainers.image.title="SLE Alertmanager"
 LABEL org.opencontainers.image.description="Alertmanager container based on the SLE Base Container Image."
diff --git a/blackbox_exporter-image/Dockerfile b/blackbox_exporter-image/Dockerfile
index f53185691..e0ab3038b 100644
--- a/blackbox_exporter-image/Dockerfile
+++ b/blackbox_exporter-image/Dockerfile
@@ -22,7 +22,6 @@ FROM suse/sle15:15.6
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=com.suse.application.blackbox_exporter
 LABEL org.opencontainers.image.title="SLE Blackbox Exporter"
 LABEL org.opencontainers.image.description="Blackbox Exporter container based on the SLE Base Container Image."
diff --git a/golang-oldstable-image/Dockerfile b/golang-oldstable-image/Dockerfile
index c0be6dc45..260dd3350 100644
--- a/golang-oldstable-image/Dockerfile
+++ b/golang-oldstable-image/Dockerfile
@@ -24,7 +24,6 @@ FROM suse/sle15:15.6
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=com.suse.bci.golang
 LABEL org.opencontainers.image.title="SLE BCI Go 1.20 development"
 LABEL org.opencontainers.image.description="Go 1.20 development container based on the SLE Base Container Image."
diff --git a/golang-oldstable-openssl-image/Dockerfile b/golang-oldstable-openssl-image/Dockerfile
index 62274890e..1bbabb4be 100644
--- a/golang-oldstable-openssl-image/Dockerfile
+++ b/golang-oldstable-openssl-image/Dockerfile
@@ -24,7 +24,6 @@ FROM suse/sle15:15.6
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=com.suse.bci.golang
 LABEL org.opencontainers.image.title="SLE BCI Go 1.19-openssl development"
 LABEL org.opencontainers.image.description="Go 1.19-openssl development container based on the SLE Base Container Image."
diff --git a/golang-stable-image/Dockerfile b/golang-stable-image/Dockerfile
index 23c838b24..cfcde4ab2 100644
--- a/golang-stable-image/Dockerfile
+++ b/golang-stable-image/Dockerfile
@@ -24,7 +24,6 @@ FROM suse/sle15:15.6
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=com.suse.bci.golang
 LABEL org.opencontainers.image.title="SLE BCI Go 1.21 development"
 LABEL org.opencontainers.image.description="Go 1.21 development container based on the SLE Base Container Image."
diff --git a/golang-stable-openssl-image/Dockerfile b/golang-stable-openssl-image/Dockerfile
index e05f71368..f471449b6 100644
--- a/golang-stable-openssl-image/Dockerfile
+++ b/golang-stable-openssl-image/Dockerfile
@@ -24,7 +24,6 @@ FROM suse/sle15:15.6
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=com.suse.bci.golang
 LABEL org.opencontainers.image.title="SLE BCI Go 1.20-openssl development"
 LABEL org.opencontainers.image.description="Go 1.20-openssl development container based on the SLE Base Container Image."
diff --git a/grafana-image/Dockerfile b/grafana-image/Dockerfile
index 8e98ba35b..b5357cec5 100644
--- a/grafana-image/Dockerfile
+++ b/grafana-image/Dockerfile
@@ -22,7 +22,6 @@ FROM suse/sle15:15.6
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=com.suse.application.grafana
 LABEL org.opencontainers.image.title="SLE Grafana"
 LABEL org.opencontainers.image.description="Grafana container based on the SLE Base Container Image."
diff --git a/init-image/Dockerfile b/init-image/Dockerfile
index 424a5c2b3..e8086f31e 100644
--- a/init-image/Dockerfile
+++ b/init-image/Dockerfile
@@ -22,7 +22,6 @@ FROM suse/sle15:15.6
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=com.suse.bci.init
 LABEL org.opencontainers.image.title="SLE BCI 15 SP6 Init"
 LABEL org.opencontainers.image.description="Systemd environment for containers based on the SLE Base Container Image. This container is only supported with podman."
diff --git a/nginx-image/Dockerfile b/nginx-image/Dockerfile
index 43af86cf1..8cf9e463b 100644
--- a/nginx-image/Dockerfile
+++ b/nginx-image/Dockerfile
@@ -22,7 +22,6 @@ FROM suse/sle15:15.6
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=com.suse.application.nginx
 LABEL org.opencontainers.image.title="SLE NGINX"
 LABEL org.opencontainers.image.description="NGINX open source all-in-one load balancer, content cache and web server based on the SLE Base Container Image."
diff --git a/nodejs-20-image/Dockerfile b/nodejs-20-image/Dockerfile
index 1f7db2544..1c9936b3d 100644
--- a/nodejs-20-image/Dockerfile
+++ b/nodejs-20-image/Dockerfile
@@ -24,7 +24,6 @@ FROM suse/sle15:15.6
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=com.suse.bci.nodejs
 LABEL org.opencontainers.image.title="SLE BCI Node.js 20 development"
 LABEL org.opencontainers.image.description="Node.js 20 development container based on the SLE Base Container Image."
diff --git a/openjdk-11-devel-image/Dockerfile b/openjdk-11-devel-image/Dockerfile
index c50af0af2..1227cef37 100644
--- a/openjdk-11-devel-image/Dockerfile
+++ b/openjdk-11-devel-image/Dockerfile
@@ -22,7 +22,6 @@ FROM bci/openjdk:11
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=com.suse.bci.openjdk.devel
 LABEL org.opencontainers.image.title="SLE BCI OpenJDK 11 development"
 LABEL org.opencontainers.image.description="OpenJDK 11 development container based on the SLE Base Container Image."
diff --git a/openjdk-11-image/Dockerfile b/openjdk-11-image/Dockerfile
index 2230e022d..ec763b37b 100644
--- a/openjdk-11-image/Dockerfile
+++ b/openjdk-11-image/Dockerfile
@@ -22,7 +22,6 @@ FROM suse/sle15:15.6
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=com.suse.bci.openjdk
 LABEL org.opencontainers.image.title="SLE BCI OpenJDK 11 runtime"
 LABEL org.opencontainers.image.description="OpenJDK 11 runtime container based on the SLE Base Container Image."
diff --git a/openjdk-17-devel-image/Dockerfile b/openjdk-17-devel-image/Dockerfile
index 2a199e155..114844353 100644
--- a/openjdk-17-devel-image/Dockerfile
+++ b/openjdk-17-devel-image/Dockerfile
@@ -22,7 +22,6 @@ FROM bci/openjdk:17
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=com.suse.bci.openjdk.devel
 LABEL org.opencontainers.image.title="SLE BCI OpenJDK 17 development"
 LABEL org.opencontainers.image.description="OpenJDK 17 development container based on the SLE Base Container Image."
diff --git a/openjdk-17-image/Dockerfile b/openjdk-17-image/Dockerfile
index 64eb7325b..d9f4e6eb4 100644
--- a/openjdk-17-image/Dockerfile
+++ b/openjdk-17-image/Dockerfile
@@ -22,7 +22,6 @@ FROM suse/sle15:15.6
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=com.suse.bci.openjdk
 LABEL org.opencontainers.image.title="SLE BCI OpenJDK 17 runtime"
 LABEL org.opencontainers.image.description="OpenJDK 17 runtime container based on the SLE Base Container Image."
diff --git a/pcp-image/Dockerfile b/pcp-image/Dockerfile
index 2a2848475..3fcd2e24f 100644
--- a/pcp-image/Dockerfile
+++ b/pcp-image/Dockerfile
@@ -26,7 +26,6 @@ FROM bci/bci-init:15.6
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=com.suse.application.pcp
 LABEL org.opencontainers.image.title="SLE Performance Co-Pilot (pcp)"
 LABEL org.opencontainers.image.description="Performance Co-Pilot (pcp) container based on the SLE Base Container Image. This container is only supported with podman."
diff --git a/php-apache8-image/Dockerfile b/php-apache8-image/Dockerfile
index 4996cac08..e7120c603 100644
--- a/php-apache8-image/Dockerfile
+++ b/php-apache8-image/Dockerfile
@@ -22,7 +22,6 @@ FROM suse/sle15:15.6
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=com.suse.bci.php-apache
 LABEL org.opencontainers.image.title="SLE BCI PHP-Apache 8"
 LABEL org.opencontainers.image.description="PHP-Apache 8 container based on the SLE Base Container Image."
diff --git a/php-fpm8-image/Dockerfile b/php-fpm8-image/Dockerfile
index 84c16c7bb..ae8b961f7 100644
--- a/php-fpm8-image/Dockerfile
+++ b/php-fpm8-image/Dockerfile
@@ -22,7 +22,6 @@ FROM suse/sle15:15.6
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=com.suse.bci.php-fpm
 LABEL org.opencontainers.image.title="SLE BCI PHP-FPM 8"
 LABEL org.opencontainers.image.description="PHP-FPM 8 container based on the SLE Base Container Image."
diff --git a/php8-image/Dockerfile b/php8-image/Dockerfile
index de445f153..8c600a31b 100644
--- a/php8-image/Dockerfile
+++ b/php8-image/Dockerfile
@@ -22,7 +22,6 @@ FROM suse/sle15:15.6
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=com.suse.bci.php
 LABEL org.opencontainers.image.title="SLE BCI PHP 8"
 LABEL org.opencontainers.image.description="PHP 8 container based on the SLE Base Container Image."
diff --git a/postgres-15-image/Dockerfile b/postgres-15-image/Dockerfile
index ecfb149cd..a6d77d7ec 100644
--- a/postgres-15-image/Dockerfile
+++ b/postgres-15-image/Dockerfile
@@ -25,7 +25,6 @@ FROM suse/sle15:15.6
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=com.suse.application.postgres
 LABEL org.opencontainers.image.title="SLE PostgreSQL 15"
 LABEL org.opencontainers.image.description="PostgreSQL 15 container based on the SLE Base Container Image."
diff --git a/prometheus-image/Dockerfile b/prometheus-image/Dockerfile
index a9fa6e14a..8475ed18d 100644
--- a/prometheus-image/Dockerfile
+++ b/prometheus-image/Dockerfile
@@ -22,7 +22,6 @@ FROM suse/sle15:15.6
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=com.suse.application.prometheus
 LABEL org.opencontainers.image.title="SLE Prometheus"
 LABEL org.opencontainers.image.description="Prometheus container based on the SLE Base Container Image."
diff --git a/python-3.11-image/Dockerfile b/python-3.11-image/Dockerfile
index 09849c062..69bfbc995 100644
--- a/python-3.11-image/Dockerfile
+++ b/python-3.11-image/Dockerfile
@@ -24,7 +24,6 @@ FROM suse/sle15:15.6
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=com.suse.bci.python
 LABEL org.opencontainers.image.title="SLE BCI Python 3.11 development"
 LABEL org.opencontainers.image.description="Python 3.11 development container based on the SLE Base Container Image."
diff --git a/python-3.6-image/Dockerfile b/python-3.6-image/Dockerfile
index f3442dbe6..17a228584 100644
--- a/python-3.6-image/Dockerfile
+++ b/python-3.6-image/Dockerfile
@@ -24,7 +24,6 @@ FROM suse/sle15:15.6
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=com.suse.bci.python
 LABEL org.opencontainers.image.title="SLE BCI Python 3.6 development"
 LABEL org.opencontainers.image.description="Python 3.6 development container based on the SLE Base Container Image."
diff --git a/rmt-mariadb-client-image/Dockerfile b/rmt-mariadb-client-image/Dockerfile
index ab76ff095..20ab19989 100644
--- a/rmt-mariadb-client-image/Dockerfile
+++ b/rmt-mariadb-client-image/Dockerfile
@@ -24,7 +24,6 @@ FROM suse/sle15:15.6
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=com.suse.application.rmt-mariadb-client
 LABEL org.opencontainers.image.title="SLE MariaDB Client"
 LABEL org.opencontainers.image.description="MariaDB Client container based on the SLE Base Container Image."
diff --git a/rmt-mariadb-image/Dockerfile b/rmt-mariadb-image/Dockerfile
index c5b6ffd90..127aebd13 100644
--- a/rmt-mariadb-image/Dockerfile
+++ b/rmt-mariadb-image/Dockerfile
@@ -24,7 +24,6 @@ FROM suse/sle15:15.6
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=com.suse.application.rmt-mariadb
 LABEL org.opencontainers.image.title="SLE MariaDB Server"
 LABEL org.opencontainers.image.description="MariaDB Server container based on the SLE Base Container Image."
diff --git a/rmt-nginx-image/Dockerfile b/rmt-nginx-image/Dockerfile
index 40a0ece7a..bdc09a63d 100644
--- a/rmt-nginx-image/Dockerfile
+++ b/rmt-nginx-image/Dockerfile
@@ -22,7 +22,6 @@ FROM suse/sle15:15.6
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=com.suse.application.rmt-nginx
 LABEL org.opencontainers.image.title="SLE NGINX for SUSE RMT"
 LABEL org.opencontainers.image.description="NGINX for SUSE RMT container based on the SLE Base Container Image."
diff --git a/rmt-server-image/Dockerfile b/rmt-server-image/Dockerfile
index 864372902..eaed97f5a 100644
--- a/rmt-server-image/Dockerfile
+++ b/rmt-server-image/Dockerfile
@@ -22,7 +22,6 @@ FROM suse/sle15:15.6
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=com.suse.application.rmt-server
 LABEL org.opencontainers.image.title="SLE SUSE RMT Server"
 LABEL org.opencontainers.image.description="SUSE RMT Server container based on the SLE Base Container Image."
diff --git a/ruby-2.5-image/Dockerfile b/ruby-2.5-image/Dockerfile
index 22d0d4b6f..00e36ae10 100644
--- a/ruby-2.5-image/Dockerfile
+++ b/ruby-2.5-image/Dockerfile
@@ -24,7 +24,6 @@ FROM suse/sle15:15.6
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=com.suse.bci.ruby
 LABEL org.opencontainers.image.title="SLE BCI Ruby 2.5"
 LABEL org.opencontainers.image.description="Ruby 2.5 container based on the SLE Base Container Image."
diff --git a/rust-oldstable-image/Dockerfile b/rust-oldstable-image/Dockerfile
index 3431f3ec4..9306920b8 100644
--- a/rust-oldstable-image/Dockerfile
+++ b/rust-oldstable-image/Dockerfile
@@ -24,7 +24,6 @@ FROM suse/sle15:15.6
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=com.suse.bci.rust
 LABEL org.opencontainers.image.title="SLE BCI Rust 1.72"
 LABEL org.opencontainers.image.description="Rust 1.72 container based on the SLE Base Container Image."
diff --git a/rust-stable-image/Dockerfile b/rust-stable-image/Dockerfile
index 710262930..10d02ed4b 100644
--- a/rust-stable-image/Dockerfile
+++ b/rust-stable-image/Dockerfile
@@ -24,7 +24,6 @@ FROM suse/sle15:15.6
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=com.suse.bci.rust
 LABEL org.opencontainers.image.title="SLE BCI Rust 1.73"
 LABEL org.opencontainers.image.description="Rust 1.73 container based on the SLE Base Container Image."
diff --git a/sle15-kernel-module-devel/Dockerfile b/sle15-kernel-module-devel/Dockerfile
index 29d7d0f64..144553cc9 100644
--- a/sle15-kernel-module-devel/Dockerfile
+++ b/sle15-kernel-module-devel/Dockerfile
@@ -22,7 +22,6 @@ FROM suse/sle15:15.6
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 
-# Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=com.suse.bci.sle15-kernel-module-devel
 LABEL org.opencontainers.image.title="SLE BCI SLE 15 Kernel Module Development"
 LABEL org.opencontainers.image.description="SLE 15 Kernel Module Development container based on the SLE Base Container Image."