diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml
index 7d33de5c4..a1c6f22f9 100644
--- a/.github/workflows/build-images.yml
+++ b/.github/workflows/build-images.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   build-images:
-    runs-on: macos-13
+    runs-on: ubuntu-latest
     timeout-minutes: 120
     env:
       DOCKER_HUB_PARACHAIN: kiltprotocol/kilt-node
@@ -19,6 +19,11 @@ jobs:
       CI_COMMIT_BRANCH: ${{ github.ref_name }}
       CI_COMMIT_TAG: ${{ github.ref_name }}
     steps:
+      - name: Free Disk Space
+        uses: jlumbroso/free-disk-space@main
+        with:
+          tool-cache: true
+
       - name: Checkout
         uses: actions/checkout@v4
 
diff --git a/.maintain/build-image.sh b/.maintain/build-image.sh
index ad88929b4..09236f90e 100755
--- a/.maintain/build-image.sh
+++ b/.maintain/build-image.sh
@@ -4,17 +4,15 @@ set -e
 
 target_tag=$1
 
-# Build the builder image and push it in the background
+# Build the builder image and push it sequentially
 docker build \
     --target builder \
     --cache-from $AWS_REGISTRY/kilt-parachain/collator:builder \
     -t $AWS_REGISTRY/kilt-parachain/collator:builder \
-    . &
-docker push $AWS_REGISTRY/kilt-parachain/collator:builder &
+    .
 
-wait
+docker push $AWS_REGISTRY/kilt-parachain/collator:builder
 
-# Build and tag images in parallel
 build_and_tag() {
     local node_type=$1
     local image_name=$2
@@ -28,12 +26,10 @@ build_and_tag() {
         .
 }
 
-build_and_tag "kilt-parachain" "kilt-node" "kilt-parachain/collator" &
+build_and_tag "kilt-parachain" "kilt-node" "kilt-parachain/collator"
 
-build_and_tag "standalone-node" "standalone-node" "kilt/prototype-chain" &
+build_and_tag "standalone-node" "standalone-node" "kilt/prototype-chain"
 
-build_and_tag "dip-provider-node-template" "dip-provider-node-template" "kilt-parachain/collator" &
+build_and_tag "dip-provider-node-template" "dip-provider-node-template" "kilt-parachain/collator"
 
-build_and_tag "dip-consumer-node-template" "dip-consumer-node-template" "kilt-parachain/collator" &
-
-wait
+build_and_tag "dip-consumer-node-template" "dip-consumer-node-template" "kilt-parachain/collator"