diff --git a/Makefile b/Makefile
index fb74c740c2..345761f525 100644
--- a/Makefile
+++ b/Makefile
@@ -119,7 +119,7 @@ undeploy: ## Undeploy the PostgreSQL Operator
 
 .PHONY: deploy-dev
 deploy-dev: ## Deploy the PostgreSQL Operator locally
-deploy-dev: PGO_FEATURE_GATES ?= "TablespaceVolumes=true,VolumeSnapshots=true"
+deploy-dev: PGO_FEATURE_GATES ?= "AllAlpha=true"
 deploy-dev: get-pgmonitor
 deploy-dev: build-postgres-operator
 deploy-dev: createnamespaces
@@ -145,7 +145,7 @@ deploy-dev: createnamespaces
 ##@ Build - Binary
 .PHONY: build-postgres-operator
 build-postgres-operator: ## Build the postgres-operator binary
-	CGO_ENABLED=1 $(GO_BUILD) $(\
+	$(GO_BUILD) $(\
 		) --ldflags '-X "main.versionString=$(PGO_VERSION)"' $(\
 		) --trimpath -o bin/postgres-operator ./cmd/postgres-operator
 
diff --git a/internal/feature/features.go b/internal/feature/features.go
index ae0d4ac15b..b34117b748 100644
--- a/internal/feature/features.go
+++ b/internal/feature/features.go
@@ -75,6 +75,7 @@ const (
 	// Support automatically growing volumes
 	AutoGrowVolumes = "AutoGrowVolumes"
 
+	// Deprecated
 	BridgeIdentifiers = "BridgeIdentifiers"
 
 	// Support custom sidecars for PostgreSQL instance Pods
@@ -101,7 +102,7 @@ func NewGate() MutableGate {
 		AppendCustomQueries:     {Default: false, PreRelease: featuregate.Alpha},
 		AutoCreateUserSchema:    {Default: true, PreRelease: featuregate.Beta},
 		AutoGrowVolumes:         {Default: false, PreRelease: featuregate.Alpha},
-		BridgeIdentifiers:       {Default: false, PreRelease: featuregate.Alpha},
+		BridgeIdentifiers:       {Default: false, PreRelease: featuregate.Deprecated},
 		InstanceSidecars:        {Default: false, PreRelease: featuregate.Alpha},
 		PGBouncerSidecars:       {Default: false, PreRelease: featuregate.Alpha},
 		PGUpgradeCPUConcurrency: {Default: false, PreRelease: featuregate.Alpha},
diff --git a/internal/postgres/users.go b/internal/postgres/users.go
index be8785a4e5..b7e351cd5e 100644
--- a/internal/postgres/users.go
+++ b/internal/postgres/users.go
@@ -2,6 +2,9 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
+// [pg_query.Parse] requires CGO to compile and call https://github.com/pganalyze/libpg_query
+//go:build cgo
+
 package postgres
 
 import (