diff --git a/buildspec.yml b/buildspec.yml
index 891f86e..7b95b9e 100644
--- a/buildspec.yml
+++ b/buildspec.yml
@@ -61,10 +61,6 @@ phases:
           --build-arg ECR_REGISTRY=${ECR_REGISTRY} \
           --push mrt-inttest-services/mrt-minio-it-with-content
 
-      - |
-        docker buildx build --platform linux/arm64,linux/amd64 \
-          -t ${ECR_REGISTRY}/fakesmtp:dev \
-          --push mrt-inttest-services/fakesmtp
       - |
         docker buildx build --platform linux/arm64,linux/amd64 \
           -t ${ECR_REGISTRY}/mrt-database \
@@ -81,3 +77,14 @@ phases:
         docker buildx build --platform linux/arm64,linux/amd64 \
           -t ${ECR_REGISTRY}/callback \
           --push mrt-services/callback
+
+phases:
+  post_build:
+    # this build may fail due to rate limits
+    # on-failure: ABORT
+    commands:
+      - docker buildx create --use 
+      - |
+        docker buildx build --platform linux/arm64,linux/amd64 \
+          -t ${ECR_REGISTRY}/fakesmtp:dev \
+          --push mrt-inttest-services/fakesmtp