diff --git a/first-class-pipeline/src/com/freeleaps/devops/ImageBuilder.groovy b/first-class-pipeline/src/com/freeleaps/devops/ImageBuilder.groovy
index 9ea14174..0975d1a6 100644
--- a/first-class-pipeline/src/com/freeleaps/devops/ImageBuilder.groovy
+++ b/first-class-pipeline/src/com/freeleaps/devops/ImageBuilder.groovy
@@ -117,8 +117,8 @@ class ImageBuilder {
               steps.log.info("ImageBuilder", "Files in build context: ${filesInContext}")
               steps.log.info("ImageBuilder", "Set builder log level to plain...")
               steps.env.BUILDKIT_PROGRESS = "plain"
-              steps.log.info("ImageBuilder", "Set builder timeout to 90min...")
-              steps.env.BUILDKIT_TIMEOUT = "5400s"
+              steps.log.info("ImageBuilder", "Set builder timeout to 10min...")
+              steps.env.BUILDKIT_TIMEOUT = "1800s"
               steps.sh "docker buildx build --builder ${buildxBuilderName} --no-cache --platform ${architectures.join(",")} -t ${registry}/${repository}/${name}:${version} -f ${dockerfile} --push ${contextRoot}"
               steps.env.BUILD_IMAGE_REGISTRY = "${registry}"
               steps.env.BUILD_IMAGE_REPO = "${repository}"