diff --git a/.github/workflows/build-2nd-layer.yml b/.github/workflows/build-2nd-layer.yml
index ebba65e..220d19f 100644
--- a/.github/workflows/build-2nd-layer.yml
+++ b/.github/workflows/build-2nd-layer.yml
@@ -55,7 +55,8 @@ jobs:
             ./Containerfile-${{ matrix.type }}
           labels: |
             name=rockylinux
-            version=${{ matrix.version.major }}-ubi-${{ matrix.type }}
+            org.opencontainers.image.title=rockylinux
+            org.opencontainers.image.version=${{ matrix.version.major }}-ubi-${{ matrix.type }}
           oci: true
           tags: ${{ matrix.registry.domain }}/${{ matrix.registry.account }}/rockylinux:${{ matrix.version.major }}-ubi-${{ matrix.type }}
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4269863..363a067 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -43,6 +43,7 @@ jobs:
             ./Containerfile-${{ matrix.type }}
           labels: |
             name=rockylinux
-            version=${{ matrix.version.major }}-ubi-${{ matrix.type }}
+            org.opencontainers.image.title=rockylinux
+            org.opencontainers.image.version=${{ matrix.version.major }}-ubi-${{ matrix.type }}
           oci: true
           tags: ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_ACCOUNT }}/rockylinux:${{ matrix.version.major }}-ubi-${{ matrix.type }}
diff --git a/Containerfile-init b/Containerfile-init
index 08a06fb..c884ce2 100644
--- a/Containerfile-init
+++ b/Containerfile-init
@@ -2,9 +2,12 @@ ARG ImageVersion
 
 FROM rockylinux/rockylinux:$ImageVersion-ubi
 LABEL summary="Rocky Linux UBI init image" \
-      description="This image is designed to run an init system as PID 1 for running multi-services inside a container." \
       usage="Do not use directly. Use as a base image for daemons. Install chosen packages and 'systemctl enable' them." \
-      maintainer="Magauer Lukas <lukas@magauer.eu>"
+      org.opencontainers.image.authors="Magauer Lukas <lukas@magauer.eu>" \
+      org.opencontainers.image.description="This image is designed to run an init system as PID 1 for running multi-services inside a container." \
+      org.opencontainers.image.licenses="BSD-3-Clause" \
+      org.opencontainers.image.url="https://github.com/rocky-linux/sig-cloud-instance-images" \
+      org.opencontainers.image.vendor="Rocky Enterprise Software Foundation"
 
 CMD ["/sbin/init"]
 
diff --git a/Containerfile-micro b/Containerfile-micro
index 01e78bf..99c92d0 100644
--- a/Containerfile-micro
+++ b/Containerfile-micro
@@ -7,8 +7,11 @@ RUN rm -rf /mnt/rootfs/var/cache/* /mnt/rootfs/var/log/dnf* /mnt/rootfs/var/log/
 
 FROM scratch
 LABEL summary="Rocky Linux UBI micro image" \
-      description="Very small image which doesn't install the package manager." \
-      maintainer="Magauer Lukas <lukas@magauer.eu>"
+      org.opencontainers.image.authors="Magauer Lukas <lukas@magauer.eu>" \
+      org.opencontainers.image.description="Very small image which doesn't install the package manager." \
+      org.opencontainers.image.licenses="BSD-3-Clause" \
+      org.opencontainers.image.url="https://github.com/rocky-linux/sig-cloud-instance-images" \
+      org.opencontainers.image.vendor="Rocky Enterprise Software Foundation"
 
 COPY --from=ubi-micro-build /mnt/rootfs/ /
 COPY --from=ubi-micro-build /etc/yum.repos.d/* /etc/yum.repos.d/