diff --git a/cmds/hub/main.go b/cmds/hub/main.go
index 0d453df1..807d9290 100644
--- a/cmds/hub/main.go
+++ b/cmds/hub/main.go
@@ -90,6 +90,5 @@ func initializeGlobals(cmd *cobra.Command, args []string) {
 		BinariesIndexURLs:   configure.DefaultStableBinaryIndexURLs,
 		IntelIndexURLs:      configure.DefaultIntelIndexURLs,
 		VerifyBinaryUpdates: configure.BinarySigningTrustStore,
-		VerifyIntelUpdates:  configure.BinarySigningTrustStore,
 	}
 }
diff --git a/cmds/observation-hub/main.go b/cmds/observation-hub/main.go
index d1cfadb7..15447e67 100644
--- a/cmds/observation-hub/main.go
+++ b/cmds/observation-hub/main.go
@@ -111,6 +111,5 @@ func initializeGlobals(cmd *cobra.Command, args []string) {
 		BinariesIndexURLs:   configure.DefaultStableBinaryIndexURLs,
 		IntelIndexURLs:      configure.DefaultIntelIndexURLs,
 		VerifyBinaryUpdates: configure.BinarySigningTrustStore,
-		VerifyIntelUpdates:  configure.BinarySigningTrustStore,
 	}
 }
diff --git a/cmds/portmaster-core/main.go b/cmds/portmaster-core/main.go
index 88f187a0..52215fa1 100644
--- a/cmds/portmaster-core/main.go
+++ b/cmds/portmaster-core/main.go
@@ -14,6 +14,7 @@ import (
 	"github.com/safing/portmaster/service"
 	"github.com/safing/portmaster/service/configure"
 	"github.com/safing/portmaster/service/updates"
+	"github.com/safing/portmaster/spn/conf"
 )
 
 var (
@@ -76,6 +77,10 @@ func initializeGlobals(cmd *cobra.Command, args []string) {
 	// Configure user agent.
 	updates.UserAgent = fmt.Sprintf("Portmaster Core (%s %s)", runtime.GOOS, runtime.GOARCH)
 
+	// Enable SPN client mode
+	conf.EnableClient(true)
+	conf.EnableIntegration(true)
+
 	// Configure service.
 	cmdbase.SvcFactory = func(svcCfg *service.ServiceConfig) (cmdbase.ServiceInstance, error) {
 		svc, err := service.New(svcCfg)
@@ -92,7 +97,6 @@ func initializeGlobals(cmd *cobra.Command, args []string) {
 		BinariesIndexURLs:   configure.DefaultStableBinaryIndexURLs,
 		IntelIndexURLs:      configure.DefaultIntelIndexURLs,
 		VerifyBinaryUpdates: configure.BinarySigningTrustStore,
-		VerifyIntelUpdates:  configure.BinarySigningTrustStore,
 	}
 }