diff --git a/.github/workflows/build_addon.yml b/.github/workflows/build_addon.yml
index dbaa771..6081c14 100644
--- a/.github/workflows/build_addon.yml
+++ b/.github/workflows/build_addon.yml
@@ -146,7 +146,9 @@ jobs:
         with:
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+          labels: |
+            ${{ steps.meta.outputs.labels }}
+            io.hass.version=${{steps.meta.outputs.version}}
           build-args: |
             BUILD_FROM=${{env.BUILD_FROM}}
           file: ./${{env.TARGET}}/Dockerfile
diff --git a/nextcloud_backup/Dockerfile b/nextcloud_backup/Dockerfile
index 80e7041..2faf76a 100644
--- a/nextcloud_backup/Dockerfile
+++ b/nextcloud_backup/Dockerfile
@@ -45,29 +45,3 @@ COPY backend/package.json backend/pnpm-lock.yaml ./
 COPY --from=backend-builder /app/dist .
 COPY --from=backend-builder /app/node_modules ./node_modules
 COPY --from=frontend-builder /app/dist ./public
-
-# Build arguments
-ARG BUILD_ARCH
-ARG BUILD_DATE
-ARG BUILD_REF
-ARG BUILD_VERSION
-ARG IMAGE_SOURCE
-
-# Labels
-LABEL \
-    io.hass.name="Nextcloud Backup" \
-    io.hass.description="Addon that backup your snapshot to a Nextcloud server" \
-    io.hass.arch="${BUILD_ARCH}" \
-    io.hass.type="addon" \
-    io.hass.version=${BUILD_VERSION} \
-    maintainer="Sebclem" \
-    org.label-schema.description="Addon that backup your snapshot to a Nextcloud server" \
-    org.label-schema.build-date=${BUILD_DATE} \
-    org.label-schema.name="Nextcloud Backup" \
-    org.label-schema.schema-version="1.0" \
-    org.label-schema.url="https://addons.community" \
-    org.label-schema.usage="https://github.com/Sebclem/hassio-nextcloud-backup/tree/master/README.md" \
-    org.label-schema.vcs-ref=${BUILD_REF} \
-    org.label-schema.vcs-url="https://github.com/Sebclem/hassio-nextcloud-backup" \
-    org.label-schema.vendor="Sebclem"\
-    org.opencontainers.image.source=${IMAGE_SOURCE}