diff --git a/Dockerfile b/Dockerfile
index 3163a97..b60e463 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,8 +9,8 @@ MAINTAINER openSUSE (https://www.opensuse.org/)
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=org.opensuse.application.rmt-server
-LABEL org.opencontainers.image.title="openSUSE Tumbleweed RMT Server Container Image"
-LABEL org.opencontainers.image.description="SUSE RMT Server based on the SLE Base Container Image."
+LABEL org.opencontainers.image.title="openSUSE Tumbleweed SUSE RMT Server"
+LABEL org.opencontainers.image.description="SUSE RMT Server container based on the openSUSE Tumbleweed Base Container Image."
 LABEL org.opencontainers.image.version="%%rmt_version%%"
 LABEL org.opencontainers.image.url="https://www.opensuse.org"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
diff --git a/entrypoint.sh b/entrypoint.sh
index 3c6f6aa..f9ab4ba 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -32,7 +32,7 @@ if [ $# -eq 0 ]; then
 fi
 
 if [ "$1" == "/usr/share/rmt/bin/rails" -a "$2" == "server" ]; then
-  echo "Create/migrate RMT database"
+  echo "Create/migrate SUSE RMT database"
   pushd /usr/share/rmt > /dev/null
 	/usr/share/rmt/bin/rails db:create db:migrate RAILS_ENV=production
   popd > /dev/null
diff --git a/rmt-server-image.changes b/rmt-server-image.changes
index 09e4ef2..a4e5612 100644
--- a/rmt-server-image.changes
+++ b/rmt-server-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jun 23 15:33:33 UTC 2023 - Dirk Mueller <dmueller@suse.com>
+
+- label capitalization and related cleanups
+
 -------------------------------------------------------------------
 Tue May 30 06:52:56 UTC 2023 - Dan Čermák <dcermak@suse.com>