diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bbd47b0..d6d1b4e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -26,35 +26,18 @@ jobs:
     needs: shellcheck
     runs-on: ubuntu-latest
     permissions:
+      actions: write
       packages: write
-      contents: read    
+      contents: read
     steps:
-      - 
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
       -
         name: Checkout
         uses: actions/checkout@v4
         with:
-          fetch-depth: 0
-      -
-        name: Prepare Docker build
-        id: prepare
-        run: |
-        
-          PLATFORMS="linux/amd64,linux/arm64"
-          VERSION="${{ vars.MAJOR }}.${{ vars.MINOR }}"
-          
-          TAGS=()
-          TAGS=("${{ secrets.DOCKERHUB_REPO }}:latest")
-          TAGS+=("${{ secrets.DOCKERHUB_REPO }}:${VERSION}")
-          TAGS+=("ghcr.io/${{ github.repository }}:latest")
-          TAGS+=("ghcr.io/${{ github.repository }}:${VERSION}")
-          
-          echo "tags=${TAGS[@]}" >> $GITHUB_OUTPUT
-          echo "version=${VERSION}" >> $GITHUB_OUTPUT
-          echo "docker_platforms=${PLATFORMS}" >> $GITHUB_OUTPUT
-          echo "build_date=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
+          fetch-depth: 0    
+      - 
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
       -
         name: Login into Docker Hub
         uses: docker/login-action@v3
@@ -70,34 +53,51 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       - 
         name: Build Docker image
+        id: build
         run: |
-        
-          TAGS=(${{ steps.prepare.outputs.tags }})
 
-          echo "Build date: ${{ steps.prepare.outputs.build_date }}"
-          echo "Docker platform: ${{ steps.prepare.outputs.docker_platforms }}"
-          echo "Tags: ${{ steps.prepare.outputs.tags }}"
+          DIRECTORY="."
+          PLATFORMS="linux/amd64,linux/arm64"
+          VERSION="${{ vars.MAJOR }}.${{ vars.MINOR }}"
+          echo "version=${VERSION}" >> $GITHUB_OUTPUT
+          BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')
+          TITLE=$(grep --only-matching --perl-regex "(?<=image.title\=).*" $DIRECTORY/Dockerfile)
+          DESC=$(grep --only-matching --perl-regex "(?<=image.description\=).*" $DIRECTORY/Dockerfile)
+   
+          TAGS=()
+          TAGS=("${{ secrets.DOCKERHUB_REPO }}:latest")
+          TAGS+=("${{ secrets.DOCKERHUB_REPO }}:${VERSION}")
+          TAGS+=("ghcr.io/${{ github.repository }}:latest")
+          TAGS+=("ghcr.io/${{ github.repository }}:${VERSION}")
+          
+          LABELS=()
+          LABELS=("org.opencontainers.image.licenses=\"MIT\"")
+          LABELS+=("org.opencontainers.image.title=${TITLE}")
+          LABELS+=("org.opencontainers.image.description=${DESC}")
+          LABELS+=("org.opencontainers.image.version=\"${VERSION}\"")
+          LABELS+=("org.opencontainers.image.created=\"${BUILD_DATE}\"")
+          LABELS+=("org.opencontainers.image.revision=\"${GITHUB_RUN_ID}\"")
+          LABELS+=("org.opencontainers.image.url=\"https://hub.docker.com/r/${{ secrets.DOCKERHUB_REPO }}/\"")
+          LABELS+=("org.opencontainers.image.source=\"https://github.com/${{ github.repository }}/\"")
 
-          docker buildx build --platform ${{ steps.prepare.outputs.docker_platforms }} \
-            --output "type=image,push=true" \
+          docker buildx build --platform ${PLATFORMS} \
+            --output "type=image,push=false" \
             --progress=plain \
-            --build-arg "BUILD_ARG=${GITHUB_RUN_ID}" \
-            --build-arg "VERSION_ARG=${{ steps.prepare.outputs.version }}" \
-            --build-arg "DATE_ARG=${{ steps.prepare.outputs.build_date }}" \
+            --build-arg "VERSION_ARG=${VERSION}" \
             --build-arg "VCS_REF=${GITHUB_SHA::8}" \
-            $(printf "%s" "${TAGS[@]/#/ --tag }" ) .
-      -
-        name: Clear Docker credentials
-        run: |
-          rm -f ${HOME}/.docker/config.json
+            $(printf "%s" "${LABELS[@]/#/ --label }" ) \
+            $(printf "%s" "${TAGS[@]/#/ --tag }" ) $DIRECTORY
+            
+            rm -f ${HOME}/.docker/config.json
+            jdksks
       -
         name: Create a release
         uses: action-pack/github-release@v2
         env:
           GITHUB_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
         with:
-          tag: "v${{ steps.prepare.outputs.version }}"
-          title: "v${{ steps.prepare.outputs.version }}"
+          tag: "v${{ steps.build.outputs.version }}"
+          title: "v${{ steps.build.outputs.version }}"
       -
         name: Increment version variable
         uses: action-pack/bump@v2
diff --git a/Dockerfile b/Dockerfile
index 2914f67..5037e07 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,18 +31,10 @@ ENV DISK_SIZE "16G"
 ENV RAM_SIZE "512M"
 ENV BOOT "http://www.example.com/image.iso"
 
-ARG DATE_ARG=""
-ARG BUILD_ARG=0
 ARG VERSION_ARG="0.0"
 ENV VERSION=$VERSION_ARG
 
-LABEL org.opencontainers.image.licenses="MIT"
 LABEL org.opencontainers.image.title="QEMU for Docker"
-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/qemux/qemu-docker/"
-LABEL org.opencontainers.image.source="https://github.com/qemu-tools/qemu-docker/"
 LABEL org.opencontainers.image.description="QEMU in a docker container using KVM acceleration"
 
 ENTRYPOINT ["/usr/bin/tini", "-s", "/run/entry.sh"]