diff --git a/vscode/Dockerfile b/vscode/Dockerfile
index bb7dd4e..fa84b36 100755
--- a/vscode/Dockerfile
+++ b/vscode/Dockerfile
@@ -124,17 +124,19 @@ ARG BUILD_VERSION
 # Labels
 LABEL \
     io.hass.name="Visual Studio Code" \
-    io.hass.description="Visual Studio Code, accessible through the browser." \
+    io.hass.description="Visual Studio Code, accessible through the browser" \
     io.hass.arch="${BUILD_ARCH}" \
     io.hass.type="addon" \
     io.hass.version=${BUILD_VERSION} \
     maintainer="Franck Nijhof <frenck@addons.community>" \
-    org.label-schema.description="Visual Studio Code, accessible through the browser." \
-    org.label-schema.build-date=${BUILD_DATE} \
-    org.label-schema.name="Visual Studio Code" \
-    org.label-schema.schema-version="1.0" \
-    org.label-schema.url="https://community.home-assistant.io/t/home-assistant-community-add-on-visual-studio-code/107863?u=frenck" \
-    org.label-schema.usage="https://github.com/hassio-addons/addon-vscode/tree/master/README.md" \
-    org.label-schema.vcs-ref=${BUILD_REF} \
-    org.label-schema.vcs-url="https://github.com/hassio-addons/addon-vscode" \
-    org.label-schema.vendor="Home Assistant Community Add-ons"
+    org.opencontainers.image.title="Visual Studio Code" \
+    org.opencontainers.image.description="Visual Studio Code, accessible through the browser" \
+    org.opencontainers.image.vendor="Home Assistant Community Add-ons" \
+    org.opencontainers.image.authors="Franck Nijhof <frenck@addons.community>" \
+    org.opencontainers.image.licenses="MIT" \
+    org.opencontainers.image.url="https://addons.community" \
+    org.opencontainers.image.source="https://github.com/hassio-addons/addon-vscode" \
+    org.opencontainers.image.documentation="https://github.com/hassio-addons/addon-vscode/blob/master/README.md" \
+    org.opencontainers.image.created=${BUILD_DATE} \
+    org.opencontainers.image.revision=${BUILD_REF} \
+    org.opencontainers.image.version=${BUILD_VERSION}