diff --git a/.github/workflows/execution-plan-pr.yml b/.github/workflows/execution-plan-pr.yml
index 5c1dc0251..54be39a9f 100644
--- a/.github/workflows/execution-plan-pr.yml
+++ b/.github/workflows/execution-plan-pr.yml
@@ -3,6 +3,9 @@ name: "Execution Plan on Pull Request"
   pull_request:
     branches:
       - main
+concurrency: 
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 jobs:
   execution-plan:
     uses: ./.github/workflows/execution-plan-snippet-earthly.yml
diff --git a/.github/workflows/execution-plan-snippet-earthly.yml b/.github/workflows/execution-plan-snippet-earthly.yml
index 963183077..9283aaeea 100644
--- a/.github/workflows/execution-plan-snippet-earthly.yml
+++ b/.github/workflows/execution-plan-snippet-earthly.yml
@@ -144,6 +144,7 @@ jobs:
     if: |
         always() &&
         (needs.stageA_build.result != 'failed')  &&
+        (needs.stageA_build.result != 'cancelled')  &&
         (needs.execution_plan.outputs.stage_b != 'null')
     strategy:
       matrix:
diff --git a/Earthfile b/Earthfile
index 74ad7b9c9..3805a35d1 100644
--- a/Earthfile
+++ b/Earthfile
@@ -95,7 +95,7 @@ integration-test:
 # With alpine:3.18, we get occasional issues with gpg that says there's a process running already, even though there shouldn't be.
 # Ubuntu:22.04 seems to solve this issue.
     FROM ubuntu:22.04
-    RUN apt update && apt install -y curl gpg gpg-agent gettext bash git golang netcat-openbsd
+    RUN apt update && apt install --auto-remove -y curl gpg gpg-agent gettext bash git golang netcat-openbsd docker.io
     ARG GO_TEST_ARGS
     # K3S environment variables
     ENV KUBECONFIG=/kp/kubeconfig.yaml
diff --git a/infrastructure/docker/builder/Makefile b/infrastructure/docker/builder/Makefile
index fa60b46ed..bc674a006 100644
--- a/infrastructure/docker/builder/Makefile
+++ b/infrastructure/docker/builder/Makefile
@@ -38,7 +38,7 @@ cleanup-main:
 
 release:
 	echo "Releasing $(IMAGENAME)"
-	earthly --push +publish --DOCKER_REGISTRY_URI=$(DOCKER_REGISTRY_URI) --IMAGE_TAG=$(IMAGE_TAG) --VERSION=$(VERSION)
+	earthly --no-output --push +publish --DOCKER_REGISTRY_URI=$(DOCKER_REGISTRY_URI) --IMAGE_TAG=$(IMAGE_TAG) --VERSION=$(VERSION)
 
 publish: release
 	echo $(IMAGE_TAG)
diff --git a/infrastructure/docker/git-ssh/Makefile b/infrastructure/docker/git-ssh/Makefile
index 66d040da1..6b20d482e 100644
--- a/infrastructure/docker/git-ssh/Makefile
+++ b/infrastructure/docker/git-ssh/Makefile
@@ -37,7 +37,7 @@ cleanup-main:
 
 release:
 	echo "Releasing $(IMAGENAME)"
-	earthly --push +publish --DOCKER_REGISTRY_URI=$(DOCKER_REGISTRY_URI) --IMAGE_TAG=$(IMAGE_TAG)
+	earthly --no-output --push +publish --DOCKER_REGISTRY_URI=$(DOCKER_REGISTRY_URI) --IMAGE_TAG=$(IMAGE_TAG)
 
 publish: release
 	echo $(IMAGE_TAG)
diff --git a/infrastructure/earthly/go/Earthfile b/infrastructure/earthly/go/Earthfile
index 3b7ada6c5..42bd369a4 100644
--- a/infrastructure/earthly/go/Earthfile
+++ b/infrastructure/earthly/go/Earthfile
@@ -60,7 +60,6 @@ DOCKER:
     ARG entry_point="/main"
     ARG workdir=/kp
     ARG cgo_enabled=0
-    ARG --required image_tag
     ARG --required service
     ENV TZ=Europe/Berlin
     
@@ -79,7 +78,8 @@ DOCKER:
 
     USER kp
     WORKDIR $workdir
-
+    
+    ARG --required image_tag
     ARG use_datadog=false
     IF [ "$use_datadog" == "true" ]
         ARG dd_service=$service
diff --git a/services/cd-service/Makefile b/services/cd-service/Makefile
index ca666f845..0e7d63e30 100644
--- a/services/cd-service/Makefile
+++ b/services/cd-service/Makefile
@@ -64,11 +64,11 @@ build: bin/main
 
 build-pr:
 	echo "build on pull request"
-	$(EARTHLY) --push +build-pr --registry=$(IMAGE_REGISTRY) --tag=$(VERSION) --mirror=$(ARTIFACT_REGISTRY_MIRROR)
+	$(EARTHLY) --no-output --push +build-pr --registry=$(IMAGE_REGISTRY) --tag=$(VERSION) --mirror=$(ARTIFACT_REGISTRY_MIRROR)
 
 build-main:
 	echo "build on main"
-	$(EARTHLY) --push +build-main --registry=$(IMAGE_REGISTRY) --tag=$(VERSION) --mirror=$(ARTIFACT_REGISTRY_MIRROR)
+	$(EARTHLY) --no-output --push +build-main --registry=$(IMAGE_REGISTRY) --tag=$(VERSION) --mirror=$(ARTIFACT_REGISTRY_MIRROR)
 
 .PHONY: cleanup-pr
 cleanup-pr:
diff --git a/services/frontend-service/Makefile b/services/frontend-service/Makefile
index d3bfbb6cf..0cf704a8a 100644
--- a/services/frontend-service/Makefile
+++ b/services/frontend-service/Makefile
@@ -59,11 +59,11 @@ build: bin/main
 
 build-pr:
 	echo "build on pull request"
-	$(EARTHLY) --push +build-pr --registry=$(IMAGE_REGISTRY) --tag=$(VERSION) --mirror=$(ARTIFACT_REGISTRY_MIRROR)
+	$(EARTHLY) --no-output --push +build-pr --registry=$(IMAGE_REGISTRY) --tag=$(VERSION) --mirror=$(ARTIFACT_REGISTRY_MIRROR)
 
 build-main:
 	echo "build on main"
-	$(EARTHLY) --push +build-main --registry=$(IMAGE_REGISTRY) --tag=$(VERSION) --mirror=$(ARTIFACT_REGISTRY_MIRROR)
+	$(EARTHLY) --no-output --push +build-main --registry=$(IMAGE_REGISTRY) --tag=$(VERSION) --mirror=$(ARTIFACT_REGISTRY_MIRROR)
 
 .PHONY: cleanup-pr
 cleanup-pr:
diff --git a/services/rollout-service/Makefile b/services/rollout-service/Makefile
index 66f643f3f..5d5cf626f 100644
--- a/services/rollout-service/Makefile
+++ b/services/rollout-service/Makefile
@@ -47,11 +47,11 @@ build: bin/main
 
 build-pr:
 	echo "build on pull request"
-	$(EARTHLY) --push +build-pr --registry=$(IMAGE_REGISTRY) --tag=$(VERSION) --mirror=$(ARTIFACT_REGISTRY_MIRROR)
+	$(EARTHLY) --no-output --push +build-pr --registry=$(IMAGE_REGISTRY) --tag=$(VERSION) --mirror=$(ARTIFACT_REGISTRY_MIRROR)
 
 build-main:
 	echo "build on main"
-	$(EARTHLY) --push +build-main --registry=$(IMAGE_REGISTRY) --tag=$(VERSION) --mirror=$(ARTIFACT_REGISTRY_MIRROR)
+	$(EARTHLY) --no-output --push +build-main --registry=$(IMAGE_REGISTRY) --tag=$(VERSION) --mirror=$(ARTIFACT_REGISTRY_MIRROR)
 
 .PHONY: cleanup-pr
 cleanup-pr: