diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 8e9478fa2bd593efb1eff6cc94f04f46dc167fcf..ae5a8da23f10a1e40a661c0f2aa5b3fe4a4f2a79 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -4,8 +4,6 @@ on:
   push:
     branches: [ "master" ]
     tags: [ "v*" ]
-  pull_request:
-    branches: [ "master" ]
 
 jobs:
 
@@ -17,15 +15,15 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
          username: ${{ secrets.DOCKER_USER }}
          password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Build and push
+      - name: Build and push - latest
         uses: docker/build-push-action@v3
         with:
           context: ./dev/docker
@@ -33,6 +31,14 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ github.repository_owner }}/rdpgw:latest
+      - name: Build and push - latest
+        uses: docker/build-push-action@v3
+        with:
+          context: ./dev/docker
+          file: ./dev/docker/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ github.repository_owner }}/rdpgw:${{ github.ref_name }}
       - name: Update Docker Hub Description
         uses: peter-evans/dockerhub-description@v3
         with: