diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 6447068e..028abbc2 100755
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -575,6 +575,11 @@
                "name": "Install Docker credentials",
                "run": "echo \"${GITHUB_TOKEN}\" | docker login ghcr.io -u $ --password-stdin"
             },
+            {
+               "if": "matrix.host.upload",
+               "name": "Clean Bazel cache from previous steps",
+               "run": "bazel clean"
+            },
             {
                "if": "matrix.host.upload",
                "name": "Push container bb_copy:bb_copy",
diff --git a/tools/github_workflows/workflows_template.libsonnet b/tools/github_workflows/workflows_template.libsonnet
index 86093069..43c308c1 100644
--- a/tools/github_workflows/workflows_template.libsonnet
+++ b/tools/github_workflows/workflows_template.libsonnet
@@ -131,6 +131,11 @@
               },
               'if': 'matrix.host.upload',
             },
+            {
+              name: 'Clean Bazel cache from previous steps',
+              run: 'bazel clean',
+              'if': 'matrix.host.upload',
+            },
           ] + [
             {
               name: 'Push container %s' % container,