diff --git a/hack/Dockerfile_fips b/hack/Dockerfile_fips
index 0155950c..52869e8f 100644
--- a/hack/Dockerfile_fips
+++ b/hack/Dockerfile_fips
@@ -34,8 +34,8 @@ RUN \
   export GOOS=linux && \
   export GOARCH=amd64 &&  \
   export GOEXPERIMENT=boringcrypto && \
-  go build -v -trimpath -ldflags "$(hack/get-ldflags.sh) -w -s" -o /usr/local/bin/pinniped-concierge-kube-cert-agent ./cmd/pinniped-concierge-kube-cert-agent/... && \
-  go build -v -trimpath -ldflags "$(hack/get-ldflags.sh) -w -s" -o /usr/local/bin/pinniped-server ./cmd/pinniped-server/... && \
+  go build -v -trimpath -ldflags "$(hack/get-ldflags.sh) -w" -o /usr/local/bin/pinniped-concierge-kube-cert-agent ./cmd/pinniped-concierge-kube-cert-agent/... && \
+  go build -v -trimpath -ldflags "$(hack/get-ldflags.sh) -w" -o /usr/local/bin/pinniped-server ./cmd/pinniped-server/... && \
   ln -s /usr/local/bin/pinniped-server /usr/local/bin/pinniped-concierge && \
   ln -s /usr/local/bin/pinniped-server /usr/local/bin/pinniped-supervisor && \
   ln -s /usr/local/bin/pinniped-server /usr/local/bin/local-user-authenticator
diff --git a/internal/crypto/fips/fips_strict.go b/internal/crypto/fips/fips_strict.go
index c0aa95b8..827fd8b4 100644
--- a/internal/crypto/fips/fips_strict.go
+++ b/internal/crypto/fips/fips_strict.go
@@ -1,8 +1,8 @@
 // Copyright 2023 the Pinniped contributors. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-//go:build boringcrypto
-// +build boringcrypto
+//go:build goexperiment.boringcrypto
+// +build goexperiment.boringcrypto
 
 package fips
 
diff --git a/internal/crypto/ptls/fips_strict.go b/internal/crypto/ptls/fips_strict.go
index 2b2ba2d5..e1062923 100644
--- a/internal/crypto/ptls/fips_strict.go
+++ b/internal/crypto/ptls/fips_strict.go
@@ -4,8 +4,8 @@
 // The configurations here override the usual ptls.Secure, ptls.Default, and ptls.DefaultLDAP
 // configs when Pinniped is built in fips-only mode.
 // All of these are the same because FIPs is already so limited.
-//go:build boringcrypto
-// +build boringcrypto
+//go:build goexperiment.boringcrypto
+// +build goexperiment.boringcrypto
 
 package ptls
 
diff --git a/test/integration/securetls_fips_test.go b/test/integration/securetls_fips_test.go
index 3b0b4162..d47edf99 100644
--- a/test/integration/securetls_fips_test.go
+++ b/test/integration/securetls_fips_test.go
@@ -1,8 +1,8 @@
 // Copyright 2021-2023 the Pinniped contributors. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-//go:build boringcrypto
-// +build boringcrypto
+//go:build goexperiment.boringcrypto
+// +build goexperiment.boringcrypto
 
 package integration
 
diff --git a/test/testlib/securetls_preference_fips.go b/test/testlib/securetls_preference_fips.go
index 2920ec4c..acf677b9 100644
--- a/test/testlib/securetls_preference_fips.go
+++ b/test/testlib/securetls_preference_fips.go
@@ -1,8 +1,8 @@
 // Copyright 2022-2023 the Pinniped contributors. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-//go:build boringcrypto
-// +build boringcrypto
+//go:build goexperiment.boringcrypto
+// +build goexperiment.boringcrypto
 
 package testlib