diff --git a/.github/workflows/deploy-images.yml b/.github/workflows/deploy-images.yml
index 53d7ab368..9a6d3567f 100644
--- a/.github/workflows/deploy-images.yml
+++ b/.github/workflows/deploy-images.yml
@@ -27,6 +27,7 @@ jobs:
         run: |
           docker build \
             -t ghcr.io/bluewave-labs/checkmate-client:latest \
+            -t ghcr.io/bluewave-labs/checkmate-client:${{ env.VERSION }} \
             -f ./docker/dist/client.Dockerfile \
             --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
             --build-arg VITE_APP_VERSION=${{ env.VERSION }} \
@@ -35,6 +36,7 @@ jobs:
       - name: Push Client Docker image
         run: |
           docker push ghcr.io/bluewave-labs/checkmate-client:latest
+          docker push ghcr.io/bluewave-labs/checkmate-client:${{ env.VERSION }}
 
   docker-build-and-push-server:
     needs: docker-build-and-push-client
@@ -42,6 +44,8 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Log in to GitHub Container Registry
         uses: docker/login-action@v3
@@ -50,29 +54,31 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Build Server Docker image
-        run: |
-          docker build \
-            -t ghcr.io/bluewave-labs/checkmate-backend:latest \
-            -f ./docker/dist/server.Dockerfile \
-            --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
-            .
+      - name: Get version
+        id: vars
+        run: echo "VERSION=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV
+
+Remove `--build-arg VITE_APP_VERSION` from server image builds unless server code actually consumes this variable.
 
       - name: Push Server Docker image
         run: |
           docker push ghcr.io/bluewave-labs/checkmate-backend:latest
+          docker push ghcr.io/bluewave-labs/checkmate-backend:${{ env.VERSION }}
 
       - name: Build Mongo Docker image
         run: |
           docker build \
             -t ghcr.io/bluewave-labs/checkmate-mongo:latest \
+            -t ghcr.io/bluewave-labs/checkmate-mongo:${{ env.VERSION }} \
             -f ./docker/dist/mongoDB.Dockerfile \
             --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
+            --build-arg VITE_APP_VERSION=${{ env.VERSION }} \
             .
 
       - name: Push MongoDB Docker image
         run: |
           docker push ghcr.io/bluewave-labs/checkmate-mongo:latest
+          docker push ghcr.io/bluewave-labs/checkmate-mongo:${{ env.VERSION }}
 
   docker-build-and-push-server-mono-multiarch:
     runs-on: ubuntu-latest
@@ -104,6 +110,7 @@ jobs:
           push: true
           tags: |
             ghcr.io/bluewave-labs/checkmate-backend-mono-multiarch:latest
+            ghcr.io/bluewave-labs/checkmate-backend-mono-multiarch:${{ env.VERSION }}
           platforms: linux/amd64,linux/arm64
           labels: |
             org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate
@@ -133,10 +140,13 @@ jobs:
         run: |
           docker build \
             -t ghcr.io/bluewave-labs/checkmate-backend-mono:latest \
+            -t ghcr.io/bluewave-labs/checkmate-backend-mono:${{ env.VERSION }} \
             -f ./docker/dist-mono/server.Dockerfile \
             --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
             --build-arg VITE_APP_VERSION=${{ env.VERSION }} \
             .
 
       - name: Push Server Docker image
-        run: docker push ghcr.io/bluewave-labs/checkmate-backend-mono:latest
+        run: |
+          docker push ghcr.io/bluewave-labs/checkmate-backend-mono:latest
+          docker push ghcr.io/bluewave-labs/checkmate-backend-mono:${{ env.VERSION }}
diff --git a/docker/dist-arm/server.Dockerfile b/docker/dist-arm/server.Dockerfile
index 91ccd427e..48dee886d 100644
--- a/docker/dist-arm/server.Dockerfile
+++ b/docker/dist-arm/server.Dockerfile
@@ -3,6 +3,7 @@
 # ---------------------
 FROM node:24-slim AS frontend-build
 
+ARG VITE_APP_VERSION
 
 
 WORKDIR /app/client
diff --git a/docker/dist-mono/server.Dockerfile b/docker/dist-mono/server.Dockerfile
index 84b7127ed..1009a91e4 100644
--- a/docker/dist-mono/server.Dockerfile
+++ b/docker/dist-mono/server.Dockerfile
@@ -1,5 +1,7 @@
 FROM node:20-slim AS frontend-build
 
+ARG VITE_APP_VERSION
+
 WORKDIR /app/client
 
 COPY client/package*.json ./
@@ -10,6 +12,8 @@ RUN npm run build
 
 FROM node:20-slim AS app
 
+ARG VITE_APP_VERSION
+
 # Install ping
 RUN apt-get update \
     && apt-get install -y iputils-ping \
diff --git a/docker/dist/server.Dockerfile b/docker/dist/server.Dockerfile
index 2a6ebcb7c..42ebd42da 100755
--- a/docker/dist/server.Dockerfile
+++ b/docker/dist/server.Dockerfile
@@ -1,5 +1,7 @@
 FROM node:20-slim
 
+ARG VITE_APP_VERSION
+
 # Install ping
 RUN apt-get update \
     && apt-get install -y iputils-ping \