diff --git a/Dockerfile b/Dockerfile
index 5a9c79a..fc67609 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,12 @@
-# Build the application using the maven image
 FROM maven:3.9.9 AS builder
 
 WORKDIR /build
 COPY . .
 RUN mvn clean package
 
-# Create a slimmed version of the Java JRE using the Corretto image
 FROM amazoncorretto:21.0.6-alpine AS corretto-jdk
 
 RUN apk add --no-cache binutils
-# Build small JRE image
 RUN $JAVA_HOME/bin/jlink \
          --verbose \
          --add-modules ALL-MODULE-PATH \
@@ -19,16 +16,13 @@ RUN $JAVA_HOME/bin/jlink \
          --compress=zip-4 \
          --output /slim_jre
 
-# Use a small Linux distro for final image
 FROM alpine:latest
 ENV JAVA_HOME=/jre
 ENV PATH="${JAVA_HOME}/bin:${PATH}"
 
-# Copy the JRE into Alpine image
 COPY --from=corretto-jdk /slim_jre $JAVA_HOME
 
-# Copy the compiled app into Alpine image
-COPY --from=builder build/target/quickdrop-0.0.1-SNAPSHOT.jar app/quickdrop.jar
+COPY --from=builder /build/target/quickdrop.jar /app/quickdrop.jar
 
 WORKDIR /app
 
diff --git a/Jenkinsfile b/Jenkinsfile
index 311b029..1864d01 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,65 +1,102 @@
 pipeline {
-    agent any
+  agent any
 
-    tools {
-        jdk   'jdk-21'
-        maven 'Maven'
+  environment {
+    MAVEN_HOME = tool name: 'Maven', type: 'hudson.tasks.Maven$MavenInstallation'
+    DOCKER_REPO = "roastslav/quickdrop"
+    DOCKER_CREDENTIALS_ID = 'dockerhub-credentials'
+    VERSION_FILE = '.last_version'
+    TAG_PREFIX   = 'v'
+  }
+
+  stages {
+    stage('Build and Test') {
+      steps {
+        withMaven(maven: 'Maven') {
+          sh 'mvn -B -DskipTests clean package'
+        }
       }
-
-    environment {
-        MAVEN_HOME = tool name: 'Maven', type: 'hudson.tasks.Maven$MavenInstallation'
-        DOCKER_IMAGE = "roastslav/quickdrop:latest"
-        DOCKER_CREDENTIALS_ID = 'dockerhub-credentials'
     }
 
-    stages {
-        stage('Checkout') {
-            steps {
-                checkout scm
-            }
-        }
-
-        stage('Build and Test') {
-            steps {
-                sh "${MAVEN_HOME}/bin/mvn clean package"
-            }
-        }
-
-        stage('Docker Build and Push Multi-Arch') {
-            steps {
-                script {
-                    withCredentials([usernamePassword(credentialsId: DOCKER_CREDENTIALS_ID,
-                        passwordVariable: 'DOCKER_PASS', usernameVariable: 'DOCKER_USER')]) {
-
-                        sh """
-                          BUILDER_NAME=\$(docker buildx create --driver docker-container)
-                          docker buildx use \$BUILDER_NAME
-                          docker buildx inspect --bootstrap
-
-                          # Login
-                          echo "\$DOCKER_PASS" | docker login -u "\$DOCKER_USER" --password-stdin
-
-                          # Build & push multi-arch
-                          docker buildx build \\
-                              --platform linux/amd64,linux/arm64 \\
-                              -t ${DOCKER_IMAGE} \\
-                              --push .
-
-                          # Logout
-                          docker logout
-
-                          # Remove the ephemeral builder
-                          docker buildx rm \$BUILDER_NAME || true
-                        """
-                    }
-                }
-            }
-        }
-
-        stage('Cleanup') {
-            steps {
-                sh "docker system prune -f"
+    stage('Resolve version & decide tags') {
+      steps {
+        withMaven(maven: 'Maven') {
+          script {
+            env.APP_VERSION = sh(
+              returnStdout: true,
+              script: "mvn -q -DforceStdout help:evaluate -Dexpression=project.version"
+            ).trim()
+
+            def cleaned = env.APP_VERSION.toLowerCase().replaceAll('[^a-z0-9._-]', '')
+            if (cleaned != env.APP_VERSION) {
+              echo "Normalizing version '${env.APP_VERSION}' -> '${cleaned}' for Docker tag"
             }
+            env.APP_VERSION = cleaned
+
+            env.PREV_VERSION    = fileExists(env.VERSION_FILE) ? readFile(env.VERSION_FILE).trim() : ''
+            env.VERSION_CHANGED = (env.APP_VERSION != env.PREV_VERSION) ? 'true' : 'false'
+
+            def verTag = (env.TAG_PREFIX?.trim()) ? "${env.TAG_PREFIX}${env.APP_VERSION}" : env.APP_VERSION
+            env.IMAGE_LATEST  = "${env.DOCKER_REPO}:latest"
+            env.IMAGE_VERSION = "${env.DOCKER_REPO}:${verTag}"
+
+            echo "POM version: ${env.APP_VERSION} | Previous: ${env.PREV_VERSION} | Changed: ${env.VERSION_CHANGED}"
+            echo "Tags -> latest: ${env.IMAGE_LATEST} ; version: ${env.IMAGE_VERSION}"
+          }
         }
+      }
     }
-}
+
+    stage('Docker Build and Push Multi-Arch') {
+      when {
+        expression { env.VERSION_CHANGED == 'true' }
+      }
+      steps {
+        script {
+          withCredentials([usernamePassword(credentialsId: DOCKER_CREDENTIALS_ID,
+            passwordVariable: 'DOCKER_PASS', usernameVariable: 'DOCKER_USER')]) {
+
+            sh '''
+              set -e
+              docker version
+              docker buildx version || true
+              docker run --privileged --rm tonistiigi/binfmt --install arm64,amd64
+              BUILDER_NAME=$(docker buildx create --use || true)
+              docker buildx inspect --bootstrap
+
+              echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin
+
+              # push latest + version tag
+              docker buildx build \
+                --platform linux/amd64,linux/arm64 \
+                -t "${IMAGE_LATEST}" \
+                -t "${IMAGE_VERSION}" \
+                --label "org.opencontainers.image.version=${APP_VERSION}" \
+                --push .
+
+              docker logout
+              [ -n "$BUILDER_NAME" ] && docker buildx rm "$BUILDER_NAME" || true
+            '''
+          }
+        }
+      }
+    }
+
+    stage('Skip Docker (version unchanged)') {
+      when {
+        expression { env.VERSION_CHANGED != 'true' }
+      }
+      steps {
+        echo "Version unchanged (${APP_VERSION}). Skipping Docker build & push."
+        script { currentBuild.result = 'SUCCESS' }
+      }
+    }
+
+    stage('Persist version & Cleanup') {
+      steps {
+        writeFile file: "${env.VERSION_FILE}", text: env.APP_VERSION + "\n"
+        sh "docker system prune -f || true"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 7b6cd2e..cc13f94 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
     </parent>
     <groupId>org.rostislav</groupId>
     <artifactId>quickdrop</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>1.4.6</version>
     <name>quickdrop</name>
     <description>quickdrop</description>
     <url/>
@@ -111,6 +111,7 @@
     </dependencies>
 
     <build>
+        <finalName>quickdrop</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>