diff --git a/first-class-pipeline/src/com/freeleaps/devops/ImageBuilder.groovy b/first-class-pipeline/src/com/freeleaps/devops/ImageBuilder.groovy
index 9ea14174..7edc075a 100644
--- a/first-class-pipeline/src/com/freeleaps/devops/ImageBuilder.groovy
+++ b/first-class-pipeline/src/com/freeleaps/devops/ImageBuilder.groovy
@@ -128,13 +128,13 @@ class ImageBuilder {
               architectures.each { architecture ->
                 def archTag = architecture.split("/")[1]
                 steps.log.info("ImageBuilder", "Building image ${registry}/${repository}/${name} with architectures: ${architectures}, tag sets to ${version}")
-                steps.sh "docker build -t ${registry}/${repository}/${name}:${version}-${archTag} --platform ${architecture} -f ${dockerfile} ${contextRoot}"
-                steps.sh "docker push ${registry}/${repository}/${name}:${version}-${archTag}"
+                steps.sh "docker build -t ${registry}/${repository}/${name}:${version} --platform ${architecture} -f ${dockerfile} ${contextRoot}"
+                steps.sh "docker push ${registry}/${repository}/${name}:${version}"
               }
               steps.env.BUILD_IMAGE_REGISTRY = "${registry}"
               steps.env.BUILD_IMAGE_REPO = "${repository}"
               steps.env.BUILD_IMAGE_NAME = "${name}"
-              steps.env.BUILD_IMAGE_VERSION = "${version}-linux-amd64"
+              steps.env.BUILD_IMAGE_VERSION = "${version}"
             }
           }
           break
@@ -142,13 +142,13 @@ class ImageBuilder {
           steps.dir(workspace) {
             architectures.each { architecture ->
               def archTag = architecture.split("/")[1]
-              steps.log.info("ImageBuilder", "Building image ${registry}/${repository}/${name} with architectures: ${architectures}, tag sets to ${version}-${archTag}")
-              steps.sh "/kaniko/executor --log-format text --context ${contextRoot} --dockerfile ${dockerfile} --destination ${registry}/${repository}/${name}:${version}-${archTag} --custom-platform ${architecture}"
+              steps.log.info("ImageBuilder", "Building image ${registry}/${repository}/${name} with architectures: ${architectures}, tag sets to ${version}")
+              steps.sh "/kaniko/executor --log-format text --context ${contextRoot} --dockerfile ${dockerfile} --destination ${registry}/${repository}/${name}:${version} --custom-platform ${architecture}"
             }
             steps.env.BUILD_IMAGE_REGISTRY = "${registry}"
             steps.env.BUILD_IMAGE_REPO = "${repository}"
             steps.env.BUILD_IMAGE_NAME = "${name}"
-            steps.env.BUILD_IMAGE_VERSION = "${version}-linux-amd64"
+            steps.env.BUILD_IMAGE_VERSION = "${version}"
           }
           break
         default: