diff --git a/.drone.star b/.drone.star
index 0a412ba67b..fcb3b61a99 100644
--- a/.drone.star
+++ b/.drone.star
@@ -695,6 +695,11 @@ def dockerReleases(ctx):
   return pipelines
 
 def dockerRelease(ctx, arch):
+  build_args = [
+    'REVISION=%s' % (ctx.build.commit),
+    'VERSION=%s' % (ctx.build.ref.replace("refs/tags/", "") if ctx.build.event == "tag" else "latest")
+  ]
+
   return {
     'kind': 'pipeline',
     'type': 'docker',
@@ -716,6 +721,7 @@ def dockerRelease(ctx, arch):
           'tags': 'linux-%s' % (arch),
           'dockerfile': 'ocis/docker/Dockerfile.linux.%s' % (arch),
           'repo': ctx.repo.slug,
+          'build_args': build_args,
         },
         'when': {
           'ref': {
@@ -740,7 +746,8 @@ def dockerRelease(ctx, arch):
           'context': 'ocis',
           'auto_tag_suffix': 'linux-%s' % (arch),
           'dockerfile': 'ocis/docker/Dockerfile.linux.%s' % (arch),
-          'repo': ctx.repo.slug,
+          'repo': ctx.build.commit,
+          'build_args': build_args,
         },
         'when': {
           'ref': {
diff --git a/changelog/unreleased/opencontainers-labels.md b/changelog/unreleased/opencontainers-labels.md
new file mode 100644
index 0000000000..26ab6d20fb
--- /dev/null
+++ b/changelog/unreleased/opencontainers-labels.md
@@ -0,0 +1,5 @@
+Enhancement: Switch to opencontainers annotation scheme
+
+Switch docker image annotation scheme to org.opencontainers standard because org.label-schema is depreciated.
+
+https://github.com/owncloud/ocis/pull/1381
diff --git a/ocis/docker/Dockerfile.linux.amd64 b/ocis/docker/Dockerfile.linux.amd64
index 59498cabd2..a5919002d2 100644
--- a/ocis/docker/Dockerfile.linux.amd64
+++ b/ocis/docker/Dockerfile.linux.amd64
@@ -1,5 +1,8 @@
 FROM amd64/alpine:3.12
 
+ARG VERSION=""
+ARG REVISION=""
+
 RUN apk update && \
 	apk upgrade && \
 	apk add ca-certificates mailcap && \
@@ -7,9 +10,16 @@ RUN apk update && \
 	echo 'hosts: files dns' >| /etc/nsswitch.conf
 
 LABEL maintainer="ownCloud GmbH <devops@owncloud.com>" \
-  org.label-schema.name="ownCloud Infinite Scale" \
-  org.label-schema.vendor="ownCloud GmbH" \
-  org.label-schema.schema-version="1.0"
+  org.opencontainers.image.title="ownCloud Infinite Scale" \
+  org.opencontainers.image.vendor="ownCloud GmbH" \
+  org.opencontainers.image.authors="ownCloud GmbH" \
+  org.opencontainers.image.description="oCIS - ownCloud Infinite Scale is a modern file-sync and share platform" \
+  org.opencontainers.image.licenses="Apache-2.0" \
+  org.opencontainers.image.documentation="https://github.com/owncloud/ocis" \
+  org.opencontainers.image.url="https://hub.docker.com/r/owncloud/ocis" \
+  org.opencontainers.image.source="https://github.com/owncloud/ocis" \
+  org.opencontainers.image.version="${VERSION}" \
+  org.opencontainers.image.revision="${REVISION}"
 
 EXPOSE 9200/tcp
 
diff --git a/ocis/docker/Dockerfile.linux.arm b/ocis/docker/Dockerfile.linux.arm
index 7825247691..4df910624e 100644
--- a/ocis/docker/Dockerfile.linux.arm
+++ b/ocis/docker/Dockerfile.linux.arm
@@ -1,5 +1,8 @@
 FROM arm32v6/alpine:3.12
 
+ARG VERSION=""
+ARG REVISION=""
+
 RUN apk update && \
 	apk upgrade && \
 	apk add ca-certificates mailcap && \
@@ -7,9 +10,16 @@ RUN apk update && \
 	echo 'hosts: files dns' >| /etc/nsswitch.conf
 
 LABEL maintainer="ownCloud GmbH <devops@owncloud.com>" \
-  org.label-schema.name="ownCloud Infinite Scale" \
-  org.label-schema.vendor="ownCloud GmbH" \
-  org.label-schema.schema-version="1.0"
+  org.opencontainers.image.title="ownCloud Infinite Scale" \
+  org.opencontainers.image.vendor="ownCloud GmbH" \
+  org.opencontainers.image.authors="ownCloud GmbH" \
+  org.opencontainers.image.description="oCIS - ownCloud Infinite Scale is a modern file-sync and share platform" \
+  org.opencontainers.image.licenses="Apache-2.0" \
+  org.opencontainers.image.documentation="https://github.com/owncloud/ocis" \
+  org.opencontainers.image.url="https://hub.docker.com/r/owncloud/ocis" \
+  org.opencontainers.image.source="https://github.com/owncloud/ocis" \
+  org.opencontainers.image.version="${VERSION}" \
+  org.opencontainers.image.revision="${REVISION}"
 
 EXPOSE 9200/tcp
 
diff --git a/ocis/docker/Dockerfile.linux.arm64 b/ocis/docker/Dockerfile.linux.arm64
index 2e3afb234c..1efa4a0b23 100644
--- a/ocis/docker/Dockerfile.linux.arm64
+++ b/ocis/docker/Dockerfile.linux.arm64
@@ -1,5 +1,8 @@
 FROM arm64v8/alpine:3.12
 
+ARG VERSION=""
+ARG REVISION=""
+
 RUN apk update && \
 	apk upgrade && \
 	apk add ca-certificates mailcap && \
@@ -7,9 +10,16 @@ RUN apk update && \
 	echo 'hosts: files dns' >| /etc/nsswitch.conf
 
 LABEL maintainer="ownCloud GmbH <devops@owncloud.com>" \
-  org.label-schema.name="ownCloud Infinite Scale" \
-  org.label-schema.vendor="ownCloud GmbH" \
-  org.label-schema.schema-version="1.0"
+  org.opencontainers.image.title="ownCloud Infinite Scale" \
+  org.opencontainers.image.vendor="ownCloud GmbH" \
+  org.opencontainers.image.authors="ownCloud GmbH" \
+  org.opencontainers.image.description="oCIS - ownCloud Infinite Scale is a modern file-sync and share platform" \
+  org.opencontainers.image.licenses="Apache-2.0" \
+  org.opencontainers.image.documentation="https://github.com/owncloud/ocis" \
+  org.opencontainers.image.url="https://hub.docker.com/r/owncloud/ocis" \
+  org.opencontainers.image.source="https://github.com/owncloud/ocis" \
+  org.opencontainers.image.version="${VERSION}" \
+  org.opencontainers.image.revision="${REVISION}"
 
 EXPOSE 9200/tcp