diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 9a72e6b..7b94b5e 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -90,7 +90,7 @@ jobs:
             echo "Checking availability of http://localhost:$port..."
             for i in {1..30}; do
               if curl -s --max-time 5 http://localhost:$port/ -X POST -H "Content-Type: application/json" --data '{"method":"eth_blockNumber","params":[],"id":1,"jsonrpc":"2.0"}'; then
-                echo "http://localhost:$port is accessible."
+                echo " ... http://localhost:$port is accessible."
                 break
               else
                 echo "http://localhost:$port is not accessible. Retrying in 10 seconds..."
@@ -102,13 +102,10 @@ jobs:
 
       - name: Build and load
         run: |
-          docker buildx bake \
-            --set "*.cache-from=type=local,src=/tmp/.buildx-cache" \
+          make docker-build ARGS="--set "*.cache-from=type=local,src=/tmp/.buildx-cache" \
             --set "*.cache-to=type=local,dest=/tmp/.buildx-cache-new" \
             --set "*.platform=linux/amd64" \
-            --builder ${{ steps.buildx.outputs.name }} \
-            -f docker-compose.yml \
-            --load
+            --builder ${{ steps.buildx.outputs.name }}"
 
       - name: Test image
         timeout-minutes: 10
@@ -178,7 +175,7 @@ jobs:
 
       - name: Run Docker
         run: |
-          make docker
+          make docker-local
         working-directory: ethereum-contracts
         env:
           DOCKER_TAG: "1.1.2"
@@ -189,7 +186,7 @@ jobs:
             echo "Checking availability of http://localhost:$port..."
             for i in {1..30}; do
               if curl -s --max-time 5 http://localhost:$port/ -X POST -H "Content-Type: application/json" --data '{"method":"eth_blockNumber","params":[],"id":1,"jsonrpc":"2.0"}'; then
-                echo "http://localhost:$port is accessible."
+                echo " ... http://localhost:$port is accessible."
                 break
               else
                 echo "http://localhost:$port is not accessible. Retrying in 10 seconds..."