diff --git a/dev/ci/bazel-prechecks-apply.sh b/dev/ci/bazel-prechecks-apply.sh
index fa6f899dcec..cbf15d4ae78 100755
--- a/dev/ci/bazel-prechecks-apply.sh
+++ b/dev/ci/bazel-prechecks-apply.sh
@@ -9,4 +9,6 @@ if [[ $status -ne 0 && "$response" == *"No artifacts found for downloading"* ]];
   exit 0
 fi
 
-git apply bazel-configure.diff
+if [ -f bazel-configure.diff ]; then
+  git apply bazel-configure.diff
+fi
diff --git a/dev/ci/internal/ci/bazel_operations.go b/dev/ci/internal/ci/bazel_operations.go
index 73ca65199e8..739b8e20dcc 100644
--- a/dev/ci/internal/ci/bazel_operations.go
+++ b/dev/ci/internal/ci/bazel_operations.go
@@ -42,13 +42,21 @@ func bazelCmd(args ...string) string {
 }
 
 // Used in default run type
-func bazelPushImagesCandidates(version string) func(*bk.Pipeline) {
-	return bazelPushImagesCmd(version, true, "bazel-tests")
+func bazelPushImagesCandidates(version string, isAspectBuild bool) func(*bk.Pipeline) {
+	depKey := "bazel-tests"
+	if isAspectBuild {
+		depKey = "__main__::test"
+	}
+	return bazelPushImagesCmd(version, true, depKey)
 }
 
 // Used in default run type
-func bazelPushImagesFinal(version string) func(*bk.Pipeline) {
-	return bazelPushImagesCmd(version, false, "bazel-tests")
+func bazelPushImagesFinal(version string, isAspectBuild bool) func(*bk.Pipeline) {
+	depKey := "bazel-tests"
+	if isAspectBuild {
+		depKey = "__main__::test"
+	}
+	return bazelPushImagesCmd(version, false, depKey)
 }
 
 // Used in CandidateNoTest run type
diff --git a/dev/ci/internal/ci/pipeline.go b/dev/ci/internal/ci/pipeline.go
index cab1d02b5ea..dd8d8fa3f2d 100644
--- a/dev/ci/internal/ci/pipeline.go
+++ b/dev/ci/internal/ci/pipeline.go
@@ -304,7 +304,7 @@ func GeneratePipeline(c Config) (*bk.Pipeline, error) {
 
 		// Publish candidate images to dev registry
 		publishOpsDev := operations.NewNamedSet("Publish candidate images")
-		publishOpsDev.Append(bazelPushImagesCandidates(c.Version))
+		publishOpsDev.Append(bazelPushImagesCandidates(c.Version, isAspectWorkflowBuild))
 		ops.Merge(publishOpsDev)
 
 		// End-to-end tests
@@ -340,7 +340,7 @@ func GeneratePipeline(c Config) (*bk.Pipeline, error) {
 			}
 		}
 		// Final Bazel images
-		publishOps.Append(bazelPushImagesFinal(c.Version))
+		publishOps.Append(bazelPushImagesFinal(c.Version, isAspectWorkflowBuild))
 		ops.Merge(publishOps)
 	}