diff --git a/cmd/Dockerfile b/cmd/Dockerfile
index 78b24a4a051..b9629636326 100644
--- a/cmd/Dockerfile
+++ b/cmd/Dockerfile
@@ -37,7 +37,7 @@ WORKDIR /app
 
 ARG GOARCH=amd64
 # TAGS can be overriden to modify the go build tags (e.g. build without netgo)
-ARG TAGS="netgo"
+ARG TAGS="netgo,osusergo"
 # CC flag can be overwritten to specify a C compiler
 ARG CC=""
 # CGO_FLAG uses ADX instructions by default, flag can be overwritten to build without ADX
diff --git a/state/protocol/defaults.go b/state/protocol/defaults.go
index 320c897d638..c26640957c5 100644
--- a/state/protocol/defaults.go
+++ b/state/protocol/defaults.go
@@ -12,7 +12,7 @@ import (
 // more details on this value.
 func DefaultEpochCommitSafetyThreshold(chain flow.ChainID) (uint64, error) {
 	switch chain {
-	case flow.Mainnet, flow.Testnet, flow.Sandboxnet:
+	case flow.Mainnet, flow.Testnet, flow.Sandboxnet, flow.Previewnet:
 		return 1_000, nil
 	case flow.Localnet, flow.Benchnet, flow.BftTestnet, flow.Emulator:
 		return 100, nil