diff --git a/first-class-pipeline/src/com/freeleaps/devops/ImageBuilder.groovy b/first-class-pipeline/src/com/freeleaps/devops/ImageBuilder.groovy
index c5dae653..d9e66d2b 100644
--- a/first-class-pipeline/src/com/freeleaps/devops/ImageBuilder.groovy
+++ b/first-class-pipeline/src/com/freeleaps/devops/ImageBuilder.groovy
@@ -62,10 +62,9 @@ class ImageBuilder {
       steps.log.info("ImageBuilder", "Inspecting buildx builder with name: multiarch-builder-${name}")
       steps.sh "docker buildx inspect --bootstrap"
       steps.log.info("ImageBuilder", "Register clean up hook for buildx builder deletion for builder named: multiarch-builder-${name}")
-      steps.post {
-        always {
-          steps.sh "docker buildx rm multiarch-builder-${name} || true"
-        }
+      def context = steps.$build()
+      context.cleanup {
+        steps.sh "docker buildx rm multiarch-builder-${name} || true"
       }
       this.buildxBuilderName = "multiarch-builder-${name}"
     }