diff --git a/Dockerfile b/Dockerfile
index 9cb39b2..deaeec9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,13 +11,16 @@
 ARG KUBEVIRTFROM
 FROM $KUBEVIRTFROM
 
+# Mandatory labels for the build service:
+#   https://en.opensuse.org/Building_derived_containers
 # labelprefix=%%LABELPREFIX%%
-PREFIXEDLABEL org.opencontainers.image.title="CDI upload server container"
-PREFIXEDLABEL org.opencontainers.image.description="Upload server for the data fetching service for VM container images"
-PREFIXEDLABEL org.opencontainers.image.created="%BUILDTIME%"
-PREFIXEDLABEL org.opencontainers.image.version="%%PKG_VERSION%%.%RELEASE%"
-PREFIXEDLABEL org.openbuildservice.disturl="%DISTURL%"
-PREFIXEDLABEL org.opensuse.reference="%%REGISTRY%%/%%TAGPREFIX%%/cdi-uploadserver:%%PKG_VERSION%%.%RELEASE%"
+LABEL org.opencontainers.image.title="CDI upload server container"
+LABEL org.opencontainers.image.description="Upload server for the data fetching service for VM container images"
+LABEL org.opencontainers.image.created="%BUILDTIME%"
+LABEL org.opencontainers.image.version="%%PKG_VERSION%%.%RELEASE%"
+LABEL org.openbuildservice.disturl="%DISTURL%"
+LABEL org.opensuse.reference="%%REGISTRY%%/%%TAGPREFIX%%/cdi-uploadserver:%%PKG_VERSION%%.%RELEASE%"
+# endlabelprefix
 
 RUN zypper -n install \
            qemu-tools qemu-block-curl tar util-linux \
diff --git a/cdi-uploadserver-container.changes b/cdi-uploadserver-container.changes
index 7a71fb8..f846bcc 100644
--- a/cdi-uploadserver-container.changes
+++ b/cdi-uploadserver-container.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Aug  4 07:48:37 UTC 2022 - Vasily Ulyanov <vasily.ulyanov@suse.com>
+
+- Use standard LABEL directive to add mandatory labels
+
 -------------------------------------------------------------------
 Wed Dec  8 15:07:44 UTC 2021 - Guillaume GARDET <guillaume.gardet@opensuse.org>