diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 79b6a04bd..3014a9347 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -38,6 +38,7 @@ jobs:
       with:
         timeout_minutes: 20
         max_attempts: 5
-        command: docker buildx build --platform linux/amd64,linux/s390x --cache-from="type=registry,ref=${CACHE_IMAGE_FULL}" --cache-to="type=registry,ref=${CACHE_IMAGE_FULL},mode=max" -t ${IMAGE_FULL}  -f apache.Dockerfile --push .
+        retry_wait_seconds: 60
+        command: docker buildx build --platform linux/amd64 --cache-from="type=registry,ref=${CACHE_IMAGE_FULL}" --cache-to="type=registry,ref=${CACHE_IMAGE_FULL},mode=max" -t ${IMAGE_FULL}  -f apache.Dockerfile --push .
     - name: "Docker Logout"
       run: docker logout
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index 086581b7e..23c372c82 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -33,4 +33,5 @@ jobs:
       with:
         timeout_minutes: 100
         max_attempts: 5
+        retry_wait_seconds: 60
         command: docker buildx build --platform linux/amd64 --cache-from="type=registry,ref=${CACHE_IMAGE_FULL}" -t ${IMAGE_FULL}  -f apache.Dockerfile .