diff --git a/examples/cmd/benchmark_decision.go b/examples/cmd/benchmark_decision.go
index 2f478776dc..5cab508f6d 100644
--- a/examples/cmd/benchmark_decision.go
+++ b/examples/cmd/benchmark_decision.go
@@ -43,7 +43,7 @@ func runDecisionBenchmark(_ *cobra.Command, _ []string) error {
 				}}},
 				EntityChains: []*authorization.EntityChain{
 					{Id: "rewrap-tok", Entities: []*authorization.Entity{
-						{Id: "jwtentity-0-clientid-opentdf-public", EntityType: &authorization.Entity_ClientId{ClientId: "opentdf-public"}, Category: authorization.Entity_CATEGORY_ENVIRONMENT},
+						{Id: "jwtentity-0-clientid-cli-client", EntityType: &authorization.Entity_ClientId{ClientId: "cli-client"}, Category: authorization.Entity_CATEGORY_ENVIRONMENT},
 						{Id: "jwtentity-1-username-sample-user", EntityType: &authorization.Entity_UserName{UserName: "sample-user"}, Category: authorization.Entity_CATEGORY_SUBJECT},
 					}},
 				},
diff --git a/examples/cmd/benchmark_decision_v2.go b/examples/cmd/benchmark_decision_v2.go
index ba7cc92336..0b362c9ec3 100644
--- a/examples/cmd/benchmark_decision_v2.go
+++ b/examples/cmd/benchmark_decision_v2.go
@@ -58,7 +58,7 @@ func runDecisionBenchmarkV2(_ *cobra.Command, _ []string) error {
 					Entities: []*entity.Entity{
 						{
 							EphemeralId: "jwtentity-0-clientid-opentdf-sdk",
-							EntityType:  &entity.Entity_ClientId{ClientId: "opentdf-public"},
+							EntityType:  &entity.Entity_ClientId{ClientId: "cli-client"},
 							Category:    entity.Entity_CATEGORY_ENVIRONMENT,
 						},
 						{
diff --git a/service/cmd/keycloak_data.yaml b/service/cmd/keycloak_data.yaml
index 0040026809..ef54501c48 100644
--- a/service/cmd/keycloak_data.yaml
+++ b/service/cmd/keycloak_data.yaml
@@ -81,16 +81,6 @@ realms:
             - 'http://localhost:*'
           protocolMappers:
             - *customAudMapper
-      - client:
-          clientID: opentdf-public
-          enabled: true
-          name: opentdf-public
-          serviceAccountsEnabled: false
-          publicClient: true
-          redirectUris:
-            - 'http://localhost:9000/*' # otdfctl CLI tool
-          protocolMappers:
-            - *customAudMapper
     users:
       - username: sample-user
         enabled: true