diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fef736a..889d337 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,7 +23,18 @@ jobs:
     - uses: actions/checkout@v3
     -
       name: Build the Docker image
-      run: docker build . --file Dockerfile --build-arg "VERSION_ARG=${{ secrets.MAJOR }}.${{ secrets.MINOR }}" --build-arg "BUILD_ARG=${GITHUB_RUN_ID}" --label "id=${GITHUB_RUN_ID}" --label "version=${{ secrets.MAJOR }}.${{ secrets.MINOR }}" --tag "${{ github.repository }}:latest" --tag "${{ github.repository }}:${{ secrets.MAJOR }}.${{ secrets.MINOR }}" --tag "ghcr.io/${{ github.repository }}:latest" --tag "ghcr.io/${{ github.repository }}:${{ secrets.MAJOR }}.${{ secrets.MINOR }}"
+      run: |
+              docker build . \
+              --file Dockerfile \
+              --build-arg "VERSION_ARG=${{ secrets.MAJOR }}.${{ secrets.MINOR }}" \
+              --build-arg "BUILD_ARG=${GITHUB_RUN_ID}" \
+              --build-arg "DATE_ARG=${{ github.event.repository.updated_at }}" \
+              --label "build=${GITHUB_RUN_ID}" \
+              --label "version=${{ secrets.MAJOR }}.${{ secrets.MINOR }}" \
+              --tag "${{ github.repository }}:latest" \
+              --tag "${{ github.repository }}:${{ secrets.MAJOR }}.${{ secrets.MINOR }}" \
+              --tag "ghcr.io/${{ github.repository }}:latest" \
+              --tag "ghcr.io/${{ github.repository }}:${{ secrets.MAJOR }}.${{ secrets.MINOR }}"
     -
       name: Update Minor version
       uses: hmanzur/actions-set-secret@v2.0.0
@@ -40,7 +51,9 @@ jobs:
         password: ${{ secrets.DOCKERHUB_TOKEN }}
     -
       name: Push to DockerHub
-      run: docker push "${{ github.repository }}:${{ secrets.MAJOR }}.${{ secrets.MINOR }}" && docker push "${{ github.repository }}:latest"
+      run: |
+              docker push "${{ github.repository }}:${{ secrets.MAJOR }}.${{ secrets.MINOR }}" &&\
+              docker push "${{ github.repository }}:latest"
     -
       name: Login to GitHub Container Registry
       uses: docker/login-action@v2
@@ -50,7 +63,9 @@ jobs:
         password: ${{ secrets.GITHUB_TOKEN }}
     -
       name: Push to Github Container Registry
-      run: docker push "ghcr.io/${{ github.repository }}:${{ secrets.MAJOR }}.${{ secrets.MINOR }}" && docker push "ghcr.io/${{ github.repository }}:latest"
+      run: |
+              docker push "ghcr.io/${{ github.repository }}:${{ secrets.MAJOR }}.${{ secrets.MINOR }}" && \
+              docker push "ghcr.io/${{ github.repository }}:latest"
   mirror:
     runs-on: ubuntu-latest
     permissions:
@@ -64,5 +79,5 @@ jobs:
       uses: wangchucheng/git-repo-sync@v0.1.0
       with:
         target-url: ${{ secrets.GITLAB_URL }}
-        target-username: ${{ secrets.GITLAB_USERNAME }}
         target-token: ${{ secrets.GITLAB_TOKEN }}
+        target-username: ${{ secrets.GITLAB_USERNAME }}
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 7f69165..adb2543 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -1,10 +1,10 @@
 on: [workflow_call]
-name: "Shellcheck"
+name: "shellcheck"
 permissions: {}
 
 jobs:
   shellcheck:
-    name: Shellcheck
+    name: shellcheck
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
diff --git a/Dockerfile b/Dockerfile
index d87e65d..88a79c2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -57,11 +57,17 @@ ENV RAM_SIZE "512M"
 ENV HOST_SERIAL ""
 ENV GUEST_SERIAL ""
 
+ARG DATE_ARG=""
 ARG BUILD_ARG=0
 ARG VERSION_ARG="0.0"
-ENV BUILD=$BUILD_ARG
 ENV VERSION=$VERSION_ARG
 
+LABEL org.opencontainers.image.created=${DATE_ARG}
+LABEL org.opencontainers.image.revision=${BUILD_ARG}
+LABEL org.opencontainers.image.version=${VERSION_ARG}
+LABEL org.opencontainers.image.url=https://hub.docker.com/r/kroese/virtual-dsm/
+LABEL org.opencontainers.image.source=https://github.com/kroese/virtual-dsm/
+
 HEALTHCHECK --interval=30s --timeout=2s CMD curl -ILfSs http://20.20.20.21:5000/ || exit 1
 
 ENTRYPOINT ["/run/run.sh"]