diff --git a/builder.go b/builder.go
index b4badf4..6509a89 100644
--- a/builder.go
+++ b/builder.go
@@ -131,6 +131,7 @@ func (b Builder) Build(ctx context.Context, outputFile string) error {
 			cmd.Args = append(cmd.Args,
 				"-ldflags", "-w -s", // trim debug symbols
 				"-trimpath",
+				"-tags", "nobadger",
 			)
 		}
 	}
diff --git a/environment.go b/environment.go
index 38b616c..089d31c 100644
--- a/environment.go
+++ b/environment.go
@@ -127,7 +127,7 @@ func (b Builder) newEnvironment(ctx context.Context) (*environment, error) {
 		tempFolder:      tempFolder,
 		timeoutGoGet:    b.TimeoutGet,
 		skipCleanup:     b.SkipCleanup,
-		buildFlags:      strings.TrimSpace("-tags nobadger " + b.BuildFlags),
+		buildFlags:      b.BuildFlags,
 		modFlags:        b.ModFlags,
 	}