diff --git a/.github/workflows/docker.yml b/.github/workflows/sf-release.yml
similarity index 100%
rename from .github/workflows/docker.yml
rename to .github/workflows/sf-release.yml
diff --git a/build/ci.go b/build/ci.go
index 560e2818b6..5eca3d8400 100644
--- a/build/ci.go
+++ b/build/ci.go
@@ -661,7 +661,7 @@ func maybeSkipArchive(env build.Environment) {
 		log.Printf("skipping archive creation because this is a PR build")
 		os.Exit(0)
 	}
-	if env.Branch != "master" && !strings.HasPrefix(env.Branch, "firehose") && !strings.HasPrefix(env.Tag, "v1.") && !strings.Contains(env.Tag, "fh") {
+	if env.Branch != "master" && !strings.HasPrefix(env.Branch, "firehose") && !strings.HasPrefix(env.Branch, "release/") && !strings.HasPrefix(env.Tag, "v1.") && !strings.Contains(env.Tag, "fh") {
 		log.Printf("skipping archive creation because branch %q, tag %q is not on the inclusion list", env.Branch, env.Tag)
 		os.Exit(0)
 	}
@@ -705,7 +705,7 @@ func doDockerBuildx(cmdline []string) {
 		tags = []string{"latest"}
 	case strings.HasPrefix(env.Tag, "v1."):
 		tags = []string{"stable", fmt.Sprintf("release-%v", version.Family), "v" + version.Semantic}
-	case strings.HasPrefix(env.Branch, "firehose"):
+	case strings.HasPrefix(env.Branch, "firehose") || strings.HasPrefix(env.Branch, "release/"):
 		tags = []string{"edge-fh" + tracers.FirehoseProtocolVersion}
 	case strings.Contains(env.Tag, "fh"):
 		tags = []string{"stable-fh" + tracers.FirehoseProtocolVersion, "v" + version.Semantic + "-fh" + tracers.FirehoseProtocolVersion}