diff --git a/go.mod b/go.mod
index a83245a9f..4019e4f2a 100644
--- a/go.mod
+++ b/go.mod
@@ -52,7 +52,7 @@ require (
 	github.com/pomerium/csrf v1.7.0
 	github.com/pomerium/datasource v0.18.2-0.20221108160055-c6134b5ed524
 	github.com/pomerium/webauthn v0.0.0-20221118023040-00a9c430578b
-	github.com/pomerium/zero-sdk v0.0.0-20230813022804-3bf1f871ab31
+	github.com/pomerium/zero-sdk v0.0.0-20230816000855-af1b8165df05
 	github.com/prometheus/client_golang v1.16.0
 	github.com/prometheus/client_model v0.4.0
 	github.com/prometheus/common v0.44.0
diff --git a/go.sum b/go.sum
index 0fd6b3994..8c68e2723 100644
--- a/go.sum
+++ b/go.sum
@@ -657,8 +657,8 @@ github.com/pomerium/datasource v0.18.2-0.20221108160055-c6134b5ed524 h1:3YQY1sb5
 github.com/pomerium/datasource v0.18.2-0.20221108160055-c6134b5ed524/go.mod h1:7fGbUYJnU8RcxZJvUvhukOIBv1G7LWDAHMfDxAf5+Y0=
 github.com/pomerium/webauthn v0.0.0-20221118023040-00a9c430578b h1:oll/aOfJudnqFAwCvoXK9+WN2zVjTzHVPLXCggHQmHk=
 github.com/pomerium/webauthn v0.0.0-20221118023040-00a9c430578b/go.mod h1:KswTenBBh4y1pmhU2dpm8VgJQCgSErCg7OOFTeebrNc=
-github.com/pomerium/zero-sdk v0.0.0-20230813022804-3bf1f871ab31 h1:FUoy3dpWd0ECmFHmYVUCJd7lVhQjglZsnrfjvRsVj4w=
-github.com/pomerium/zero-sdk v0.0.0-20230813022804-3bf1f871ab31/go.mod h1:cAyfEGM8blUzchYhOWrufuj/6lOF277meB4c/TjMS28=
+github.com/pomerium/zero-sdk v0.0.0-20230816000855-af1b8165df05 h1:Rl2df8q+DAd3SsJn9MpXrbo7JRNCDHVaohOyUZ2IJik=
+github.com/pomerium/zero-sdk v0.0.0-20230816000855-af1b8165df05/go.mod h1:cAyfEGM8blUzchYhOWrufuj/6lOF277meB4c/TjMS28=
 github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw=
 github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
diff --git a/internal/zero/bootstrap/bootstrap.go b/internal/zero/bootstrap/bootstrap.go
index e029a16d0..aaa40f165 100644
--- a/internal/zero/bootstrap/bootstrap.go
+++ b/internal/zero/bootstrap/bootstrap.go
@@ -37,11 +37,9 @@ const (
 func (svc *Source) Run(
 	ctx context.Context,
 	api *sdk.API,
-	mux *connect_mux.Mux,
 	fileCachePath string,
 ) error {
-	svc.clusterAPI = api
-	svc.connectMux = mux
+	svc.api = api
 	svc.fileCachePath = fileCachePath
 
 	svc.tryLoadInitial(ctx)
@@ -54,7 +52,7 @@ func (svc *Source) Run(
 }
 
 func (svc *Source) watchUpdates(ctx context.Context) error {
-	return svc.connectMux.Watch(ctx,
+	return svc.api.Watch(ctx,
 		connect_mux.WithOnConnected(func(_ context.Context) {
 			svc.triggerUpdate(DefaultCheckForUpdateIntervalWhenConnected)
 		}),
@@ -103,7 +101,7 @@ func (svc *Source) triggerUpdate(newUpdateInterval time.Duration) {
 }
 
 func (svc *Source) updateAndSave(ctx context.Context) error {
-	cfg, err := svc.clusterAPI.GetClusterBootstrapConfig(ctx)
+	cfg, err := svc.api.GetClusterBootstrapConfig(ctx)
 	if err != nil {
 		return fmt.Errorf("load bootstrap config from API: %w", err)
 	}
diff --git a/internal/zero/bootstrap/new.go b/internal/zero/bootstrap/new.go
index a27f5983c..09bda470a 100644
--- a/internal/zero/bootstrap/new.go
+++ b/internal/zero/bootstrap/new.go
@@ -17,15 +17,13 @@ import (
 	"github.com/pomerium/pomerium/pkg/cryptutil"
 	"github.com/pomerium/pomerium/pkg/netutil"
 	sdk "github.com/pomerium/zero-sdk"
-	connect_mux "github.com/pomerium/zero-sdk/connect-mux"
 )
 
 // Source is a base config layer for Pomerium
 type Source struct {
 	source
 
-	clusterAPI *sdk.API
-	connectMux *connect_mux.Mux
+	api *sdk.API
 
 	fileCachePath string
 	fileCipher    cipher.AEAD