diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ea0a0be..87596f4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -13,7 +13,7 @@ jobs:
     - uses: actions/checkout@v3
     -
       name: Build the Docker image
-      run: docker build . --file Dockerfile --tag kroese/virtual-dsm:latest --tag kroese/virtual-dsm:${{ secrets.MAJOR }}.${{ secrets.MINOR }}
+      run: docker build . --file Dockerfile --label "version=${{ secrets.MAJOR }}.${{ secrets.MINOR }}" --tag "kroese/virtual-dsm:latest" --tag "kroese/virtual-dsm:${{ secrets.MAJOR }}.${{ secrets.MINOR }}"
     -
       name: Login to Docker Hub
       uses: docker/login-action@v2
@@ -22,7 +22,7 @@ jobs:
         password: ${{ secrets.DOCKERHUB_TOKEN }}
     -
       name: Push to DockerHub
-      run: docker push kroese/virtual-dsm:${{ secrets.MAJOR }}.${{ secrets.MINOR }} && docker push kroese/virtual-dsm:latest
+      run: docker push "kroese/virtual-dsm:${{ secrets.MAJOR }}.${{ secrets.MINOR }}" && docker push "kroese/virtual-dsm:latest"
     -
       name: Update Minor version
       uses: hmanzur/actions-set-secret@v2.0.0