diff --git a/docker/containerbuild.sh b/docker/containerbuild.sh
index edd6d2d..a6bab9d 100755
--- a/docker/containerbuild.sh
+++ b/docker/containerbuild.sh
@@ -14,9 +14,15 @@
 USAGE="USAGE: $(basename "$0") kickstart"
 KICKSTART="$1"
 KSNAME=${KICKSTART%.*}
-BUILDDATE=$(date +%Y%m%d)
+DATETIME=$(date +%s)
+BUILDDATE=$(date --utc --date="@$DATETIME" +%Y%m%d)
+BUILDDATERFC3339=$(date --rfc-3339=seconds --utc --date="@$DATETIME")
 BUILDROOT=/var/tmp/containers/$BUILDDATE/$KSNAME
 CONT_ARCH=$(uname -m)
+ARCH="${KSNAME:8}"
+[ -n "${ARCH}" ] && ARCHD="-${ARCH}"
+RELEASEVER="${KSNAME:7:1}"
+COMMIT="$(git rev-parse HEAD)"
 
 #### Test for script requirements
 # Did we get passed a kickstart
@@ -67,11 +73,17 @@ cat << EOF > $BUILDROOT/docker/Dockerfile
 FROM scratch
 ADD $KSNAME-docker.tar.xz /
 
-LABEL org.label-schema.schema-version="1.0" \\
-    org.label-schema.name="CentOS Base Image" \\
-    org.label-schema.vendor="CentOS" \\
-    org.label-schema.license="GPLv2" \\
-    org.label-schema.build-date="$BUILDDATE"
+LABEL org.opencontainers.image.ref.name="centos-${RELEASEVER}${ARCHD}" \\
+    org.opencontainers.image.authors="centos-devel@centos.org, irc://#centos-devel@freenode" \\
+    org.opencontainers.image.url="https://www.centos.org" \\
+    org.opencontainers.image.documentation="https://github.com/docker-library/docs/tree/master/centos" \\
+    org.opencontainers.image.source="https://github.com/CentOS/sig-cloud-instance-build.git" \\
+    org.opencontainers.image.revision="${COMMIT}" \\
+    org.opencontainers.image.vendor="The CentOS Project" \\
+    org.opencontainers.image.licenses="GPL-2.0-only" \\
+    org.opencontainers.image.title="CentOS ${RELEASEVER} Base Image ${ARCH}" \\
+    org.opencontainers.image.description="CentOS Base Image"
+LABEL org.opencontainers.image.created="$BUILDDATERFC3339"
 
 CMD ["/bin/bash"]
 EOF