diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 2ad1950..5ee1b6b 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -28,5 +28,3 @@ updates:
     directory: "/" # Location of Docker manifest
     schedule:
       interval: "daily"
-
-        
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 80bd5fd..1114bcd 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -69,9 +69,9 @@ jobs:
         uses: actions/cache@v4
         with:
           path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-v1.0-service-node-${{ github.ref_name }}
+          key: ${{ runner.os }}-buildx-v1.0-service-node-${{ matrix.arch}}-${{ github.ref_name }}
           restore-keys: |
-            ${{ runner.os }}-buildx-v1.0-service-node-
+            ${{ runner.os }}-buildx-v1.0-service-node-${{ matrix.arch}}-
 
       - name: Check docker config and disable live reload
         run: |
@@ -111,7 +111,7 @@ jobs:
             --builder ${{ steps.buildx.outputs.name }}'
 
       - name: Test image
-        timeout-minutes: 10
+        timeout-minutes: ${{ matrix.arch == 'amd64' && 10 || 30 }}
         run: |
           make docker
 
diff --git a/.github/workflows/docker-vulnerabilities.yaml b/.github/workflows/docker-vulnerabilities.yaml
index 10946f7..59c8b4c 100644
--- a/.github/workflows/docker-vulnerabilities.yaml
+++ b/.github/workflows/docker-vulnerabilities.yaml
@@ -104,5 +104,3 @@ jobs:
               run: |
                 rm -rf /tmp/.buildx-cache
                 mv /tmp/.buildx-cache-new /tmp/.buildx-cache
-            
-        
diff --git a/.github/workflows/sonar.yaml b/.github/workflows/sonar.yaml
index c15f880..00e22a4 100644
--- a/.github/workflows/sonar.yaml
+++ b/.github/workflows/sonar.yaml
@@ -10,4 +10,3 @@ jobs:
     if: github.repository == 'pantos-io/servicenode'
     uses: pantos-io/ci-workflows/.github/workflows/sonar.yml@v1
     secrets: inherit
-    
diff --git a/Makefile b/Makefile
index 1e6cfe1..d45fd4d 100644
--- a/Makefile
+++ b/Makefile
@@ -242,7 +242,9 @@ check-swarm-init:
     fi
 
 docker-build:
-	docker buildx bake -f docker-compose.yml --load $(ARGS)
+	@if [ "$$NO_BUILD" != "true" ]; then \
+		docker buildx bake -f docker-compose.yml --load $(ARGS); \
+	fi
 
 docker: check-swarm-init docker-build
 	@for i in $$(seq 1 $(INSTANCE_COUNT)); do \