diff --git a/demo01-kafka-ui3/values.yaml b/demo01-kafka-ui3/values.yaml
index 90e0f87..24476f7 100644
--- a/demo01-kafka-ui3/values.yaml
+++ b/demo01-kafka-ui3/values.yaml
@@ -8,15 +8,15 @@ yamlApplicationConfig:
   kafka:
     clusters:
     - name: kafka-cluster
-      bootstrapServers: SASL_PLAINTEXT://kafka-cluster-kafka-tls-bootstrap.kafka-cluster.svc.cluster.local:9093
+      bootstrapServers: SASL_PLAINTEXT://kafka-cluster-kafka-tls-bootstrap.$kafka_cluster_namespace.svc.cluster.local:9093
       properties:
         security.protocol: SASL_PLAINTEXT
         sasl.mechanism: OAUTHBEARER
         sasl.jaas.config: |
           org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginModule required 
           oauth.token.endpoint.uri="https://keycloak.gke.paasup.io/realms/paasup/protocol/openid-connect/token" 
-          oauth.client.id="service-demo01-kafka-common" 
-          oauth.client.secret="e1eab0a7-ac78-460f-9477-73a910d8871b"
+          oauth.client.id="$KAFKA_CLIENT_ID" 
+          oauth.client.secret="$KAFKA_CLIENT_SECRET"
           oauth.ssl.truststore.location="/etc/kafka/secrets/truststore.jks"
           oauth.ssl.truststore.password="kafka";
         sasl.login.callback.handler.class: "io.strimzi.kafka.oauth.client.JaasClientOauthLoginCallbackHandler"