diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 380545b..d121dce 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -15,7 +15,7 @@ jobs:
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
       -
-        name: Checkout 
+        name: Checkout
         uses: actions/checkout@v2
       -
         name: Login to Docker Hub
@@ -34,16 +34,8 @@ jobs:
           file: ./Dockerfile
           push: true
           platforms: linux/arm64,linux/amd64
-          tags: ${{ secrets.DOCKER_HUB_USERNAME }}/nearbeach:latest
-      -
-        name: Build and push versioned - ${{ github.event.client_payload.version }}
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          file: ./Dockerfile
-          push: true
-          platforms: linux/arm64,linux/amd64
-          tags: ${{ secrets.DOCKER_HUB_USERNAME }}/nearbeach:${{ github.event.client_payload.version }}
+          tags: ${{ secrets.DOCKER_HUB_USERNAME }}/nearbeach:latest,${{ secrets.DOCKER_HUB_USERNAME }}/nearbeach:${{ github.event.client_payload.version }}
+          labels: version=${{ github.event.client_payload.version }}
       -
         name: Notify Discord
         run: |