diff --git a/docker/Dockerfile.amd64 b/docker/Dockerfile.amd64
index ca33fae..a249348 100644
--- a/docker/Dockerfile.amd64
+++ b/docker/Dockerfile.amd64
@@ -1,10 +1,11 @@
 FROM amd64/python:3.9-alpine
 
-LABEL maintainer="Robert Kaussow <mail@thegeeklab.de>" \
-    org.label-schema.name="ansible-doctor" \
-    org.label-schema.vcs-url="https://github.com/thegeeklab/ansible-doctor" \
-    org.label-schema.vendor="Robert Kaussow" \
-    org.label-schema.schema-version="1.0"
+LABEL maintainer="Robert Kaussow <mail@thegeeklab.de>"
+LABEL org.opencontainers.image.authors="Robert Kaussow <mail@thegeeklab.de>"
+LABEL org.opencontainers.image.title="ansible-doctor"
+LABEL org.opencontainers.image.url="https://ansible-doctor.geekdocs.de/"
+LABEL org.opencontainers.image.source="https://github.com/thegeeklab/ansible-doctor"
+LABEL org.opencontainers.image.documentation="https://ansible-doctor.geekdocs.de/"
 
 ENV PY_COLORS=1
 
@@ -12,7 +13,7 @@ ADD dist/ansible_doctor-*.whl /
 
 RUN apk update && \
     pip install --upgrade --no-cache-dir pip && \
-    pip install --no-cache-dir ansible_doctor-*.whl && \
+    pip install --no-cache-dir $(find / -name "ansible_doctor-*.whl") && \
     rm -f ansible_doctor-*.whl && \
     rm -rf /var/cache/apk/* && \
     rm -rf /root/.cache/
diff --git a/docker/Dockerfile.arm b/docker/Dockerfile.arm
index 7a213f1..26318a7 100644
--- a/docker/Dockerfile.arm
+++ b/docker/Dockerfile.arm
@@ -1,10 +1,11 @@
 FROM arm32v7/python:3.9-alpine
 
-LABEL maintainer="Robert Kaussow <mail@thegeeklab.de>" \
-    org.label-schema.name="ansible-doctor" \
-    org.label-schema.vcs-url="https://github.com/thegeeklab/ansible-doctor" \
-    org.label-schema.vendor="Robert Kaussow" \
-    org.label-schema.schema-version="1.0"
+LABEL maintainer="Robert Kaussow <mail@thegeeklab.de>"
+LABEL org.opencontainers.image.authors="Robert Kaussow <mail@thegeeklab.de>"
+LABEL org.opencontainers.image.title="ansible-doctor"
+LABEL org.opencontainers.image.url="https://ansible-doctor.geekdocs.de/"
+LABEL org.opencontainers.image.source="https://github.com/thegeeklab/ansible-doctor"
+LABEL org.opencontainers.image.documentation="https://ansible-doctor.geekdocs.de/"
 
 ENV PY_COLORS=1
 
@@ -12,7 +13,7 @@ ADD dist/ansible_doctor-*.whl /
 
 RUN apk update && \
     pip install --upgrade --no-cache-dir pip && \
-    pip install --no-cache-dir ansible_doctor-*.whl && \
+    pip install --no-cache-dir $(find / -name "ansible_doctor-*.whl") && \
     rm -f ansible_doctor-*.whl && \
     rm -rf /var/cache/apk/* && \
     rm -rf /root/.cache/
diff --git a/docker/Dockerfile.arm64 b/docker/Dockerfile.arm64
index f56c2ee..1c5e472 100644
--- a/docker/Dockerfile.arm64
+++ b/docker/Dockerfile.arm64
@@ -1,10 +1,11 @@
 FROM arm64v8/python:3.9-alpine
 
-LABEL maintainer="Robert Kaussow <mail@thegeeklab.de>" \
-    org.label-schema.name="ansible-doctor" \
-    org.label-schema.vcs-url="https://github.com/thegeeklab/ansible-doctor" \
-    org.label-schema.vendor="Robert Kaussow" \
-    org.label-schema.schema-version="1.0"
+LABEL maintainer="Robert Kaussow <mail@thegeeklab.de>"
+LABEL org.opencontainers.image.authors="Robert Kaussow <mail@thegeeklab.de>"
+LABEL org.opencontainers.image.title="ansible-doctor"
+LABEL org.opencontainers.image.url="https://ansible-doctor.geekdocs.de/"
+LABEL org.opencontainers.image.source="https://github.com/thegeeklab/ansible-doctor"
+LABEL org.opencontainers.image.documentation="https://ansible-doctor.geekdocs.de/"
 
 ENV PY_COLORS=1
 
@@ -12,7 +13,7 @@ ADD dist/ansible_doctor-*.whl /
 
 RUN apk update && \
     pip install --upgrade --no-cache-dir pip && \
-    pip install --no-cache-dir ansible_doctor-*.whl && \
+    pip install --no-cache-dir $(find / -name "ansible_doctor-*.whl") && \
     rm -f ansible_doctor-*.whl && \
     rm -rf /var/cache/apk/* && \
     rm -rf /root/.cache/