diff --git a/.github/workflows/_reusable-build-images.yml b/.github/workflows/_reusable-build-images.yml
index a586e64e3172..01ccd31aff57 100644
--- a/.github/workflows/_reusable-build-images.yml
+++ b/.github/workflows/_reusable-build-images.yml
@@ -31,6 +31,15 @@ jobs:
         with:
           python-version: ${{ inputs.python-version }}
           expose-github-runtime: 'true'
+      - name: Set DISABLE_CACHE_TO for PRs, no need to bloat the github cache
+        id: set-disable-cache-to
+        run: |
+          # Only enable cache-to on master/main
+          if [[ "${GITHUB_REF##*/}" == "master" || "${GITHUB_REF##*/}" == "main" ]]; then
+            echo "DISABLE_CACHE_TO=" >> $GITHUB_ENV
+          else
+            echo "DISABLE_CACHE_TO=1" >> $GITHUB_ENV
+          fi
       - name: build backend images
         if: ${{ inputs.build-backend }}
         run: |
diff --git a/Makefile b/Makefile
index 61d42b4ff96e..bd9e7704dded 100644
--- a/Makefile
+++ b/Makefile
@@ -178,6 +178,9 @@ DOCKER_BUILDX_CACHE_FROM ?= /tmp/.buildx-cache
 DOCKER_BUILDX_CACHE_TO ?= /tmp/.buildx-cache
 DOCKER_TARGET_PLATFORMS ?= linux/amd64
 comma := ,
+DISABLE_CACHE_TO ?= 0
+
+
 
 define _docker_compose_build
 $(eval INCLUDED_SERVICES := $(filter-out $(exclude), $(SERVICES_NAMES_TO_BUILD))) \
@@ -211,8 +214,9 @@ docker buildx bake --allow=fs.read=.. \
 	--file docker-compose-build.yml $(if $(target),$(target),$(INCLUDED_SERVICES)) \
 	$(if $(findstring -nc,$@),--no-cache,\
 		$(foreach service, $(SERVICES_NAMES_TO_BUILD),\
-			--set $(service).cache-to=type=gha$(comma)mode=max$(comma)scope=$(service) \
-			--set $(service).cache-from=type=gha$(comma)scope=$(service)) \
+		$(if $(DISABLE_CACHE_TO),,\
+			--set $(service).cache-to=type=gha$(comma)mode=max$(comma)scope=$(service) ) \
+		--set $(service).cache-from=type=gha$(comma)scope=$(service)) \
 	) &&\
 popd;
 endef
diff --git a/packages/service-library/src/servicelib/container_utils.py b/packages/service-library/src/servicelib/container_utils.py
index 03d468b4a977..61d34ac00031 100644
--- a/packages/service-library/src/servicelib/container_utils.py
+++ b/packages/service-library/src/servicelib/container_utils.py
@@ -30,7 +30,6 @@ class ContainerExecCommandFailedError(BaseContainerUtilsError):
 
 
 _HTTP_404_NOT_FOUND: Final[int] = 404
-
 _logger = logging.getLogger(__name__)