diff --git a/flake.nix b/flake.nix
index 979452b19..335f99849 100644
--- a/flake.nix
+++ b/flake.nix
@@ -23,6 +23,7 @@
           pre-commit
 
           goreleaser
+          gh
 
           eksctl
           postgresql
diff --git a/internal/build/configuration.go b/internal/build/configuration.go
index 1b295d5d5..f37964142 100644
--- a/internal/build/configuration.go
+++ b/internal/build/configuration.go
@@ -19,11 +19,10 @@ type buildTarget struct {
 }
 
 type buildConfiguration struct {
-	buildTarget     *buildTarget
-	source          schema.PackageName
-	label           string
-	workspace       Workspace
-	prefersBuildkit bool
+	buildTarget *buildTarget
+	source      schema.PackageName
+	label       string
+	workspace   Workspace
 }
 
 func NewBuildTarget(target *specs.Platform) *buildTarget {
@@ -50,11 +49,6 @@ func (c *buildTarget) WithWorkspace(w Workspace) *buildConfiguration {
 	return d.WithWorkspace(w)
 }
 
-func (d *buildConfiguration) WithPrefersBuildkit(prefers bool) *buildConfiguration {
-	d.prefersBuildkit = prefers
-	return d
-}
-
 func (d *buildConfiguration) WithWorkspace(w Workspace) *buildConfiguration {
 	d.workspace = w
 	return d
@@ -83,7 +77,6 @@ func CopyConfiguration(b Configuration) *buildConfiguration {
 
 	return t.WithSourcePackage(b.SourcePackage()).
 		WithSourceLabel(b.SourceLabel()).
-		WithPrefersBuildkit(b.PrefersBuildkit()).
 		WithWorkspace(b.Workspace())
 }
 
@@ -96,5 +89,4 @@ func (d *buildConfiguration) PublishName() compute.Computable[oci.RepositoryWith
 }
 func (d *buildConfiguration) SourcePackage() schema.PackageName { return d.source }
 func (d *buildConfiguration) SourceLabel() string               { return d.label }
-func (d *buildConfiguration) PrefersBuildkit() bool             { return d.prefersBuildkit }
 func (d *buildConfiguration) Workspace() Workspace              { return d.workspace }
diff --git a/internal/build/types.go b/internal/build/types.go
index 0a068c8c2..788a6afa0 100644
--- a/internal/build/types.go
+++ b/internal/build/types.go
@@ -75,10 +75,6 @@ type BuildTarget interface {
 type Configuration interface {
 	BuildTarget
 
-	// If the builder has the ability to produce with buildkit, that's
-	// preferred. A reason to do this is for instance when we want to merge
-	// multiple images together, and want to defer the merge to buildkit.
-	PrefersBuildkit() bool
 	Workspace() Workspace
 }
 
diff --git a/internal/integrations/golang/gobinary.go b/internal/integrations/golang/gobinary.go
index b55f428db..436a8f568 100644
--- a/internal/integrations/golang/gobinary.go
+++ b/internal/integrations/golang/gobinary.go
@@ -15,6 +15,7 @@ import (
 	"namespacelabs.dev/foundation/internal/compute"
 	"namespacelabs.dev/foundation/internal/fnerrors"
 	"namespacelabs.dev/foundation/internal/gosupport"
+	"namespacelabs.dev/foundation/internal/testing"
 	"namespacelabs.dev/foundation/schema"
 	"namespacelabs.dev/foundation/std/cfg/knobs"
 	"namespacelabs.dev/foundation/std/pkggraph"
@@ -38,7 +39,7 @@ type GoBinary struct {
 var UseBuildKitForBuilding = knobs.Bool("golang_use_buildkit", "If set to true, buildkit is used for building, instead of a ko-style builder.", false)
 
 func (gb GoBinary) BuildImage(ctx context.Context, env pkggraph.SealedContext, conf build.Configuration) (compute.Computable[oci.Image], error) {
-	if conf.PrefersBuildkit() || buildkit.BuildOnNamespaceCloud.Get(env.Configuration()) || UseBuildKitForBuilding.Get(env.Configuration()) {
+	if testing.UseNamespaceBuildCluster || buildkit.BuildOnNamespaceCloud.Get(env.Configuration()) || UseBuildKitForBuilding.Get(env.Configuration()) {
 		return buildUsingBuildkit(ctx, env, gb, conf)
 	}
 
diff --git a/internal/testing/environment.go b/internal/testing/environment.go
index befd37fb1..3f15ce760 100644
--- a/internal/testing/environment.go
+++ b/internal/testing/environment.go
@@ -38,6 +38,7 @@ func PrepareEnv(ctx context.Context, sourceEnv cfg.Context, ephemeral bool) (cfg
 		if err != nil {
 			return nil, err
 		}
+
 		messages = append(messages, protos.WrapAnyOrDie(msg))
 	}