diff --git a/.github/workflows/build-and-push-docker-image.yml b/.github/workflows/build-and-push-docker-image.yml
index 7304a0f..a210dd4 100644
--- a/.github/workflows/build-and-push-docker-image.yml
+++ b/.github/workflows/build-and-push-docker-image.yml
@@ -1,25 +1,36 @@
-name: Build and Publish docker image to ghcr
+name: Build and push Docker image
 
 on:
   release:
     types: [created]
 
 jobs:
-  docker:
+  build-and-push-docker-image:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
+
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v1 
+        uses: docker/login-action@v1
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Set version
+        uses: actions/github-script@v6
+        id: set-version
+        with:
+          result-encoding: string
+          script: return context.payload.release.tag_name.replace('v', '')
+
       - name: Build and push
         uses: docker/build-push-action@v2
         with:
@@ -28,4 +39,4 @@ jobs:
           push: true
           tags: |
             ghcr.io/plankanban/planka:latest
-            ghcr.io/plankanban/planka:${{ github.event.release.tag_name }}
+            ghcr.io/plankanban/planka:${{ steps.set-version.outputs.result }}