diff --git a/Dockerfile b/Dockerfile
index a373022..d4fb526 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ FROM maven:3.9.7-eclipse-temurin-17 AS builder
 COPY . /build
 WORKDIR /build
 # Build the app
-# Artifact will be stored at /build/target/json-web-key-generator-1.0.0-SNAPSHOT-jar-with-dependencies.jar
+# Artifact will be stored at /build/target/json-web-key-generator-jar-with-dependencies.jar
 RUN mvn package
 
 # Build the image with the new .jar binary
@@ -15,5 +15,5 @@ ARG GIT_TAG=unspecified
 LABEL org.opencontainers.image.authors="Besmir Zanaj"
 LABEL org.opencontainers.image.revision=$GIT_COMMIT
 LABEL org.opencontainers.image.version="$GIT_TAG"
-COPY --from=0 /build/target/json-web-key-generator-1.0.0-SNAPSHOT-jar-with-dependencies.jar ./json-web-key-generator.jar
+COPY --from=0 /build/target/json-web-key-generator-jar-with-dependencies.jar ./json-web-key-generator.jar
 ENTRYPOINT ["java", "-jar", "json-web-key-generator.jar"]
diff --git a/pom.xml b/pom.xml
index 5b70572..0f05d84 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 
 	<groupId>org.mitre</groupId>
 	<artifactId>json-web-key-generator</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
+	<version>1.2.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>json-web-key-generator</name>
@@ -59,6 +59,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
+				<version>3.7.1</version>
 				<configuration>
 					<descriptorRefs>
 						<descriptorRef>jar-with-dependencies</descriptorRef>
@@ -74,6 +75,7 @@
 						</manifestEntries>
 
 					</archive>
+					<finalName>json-web-key-generator</finalName>
 				</configuration>
 				<executions>
 					<execution>