diff --git a/api/event-bus.html b/api/event-bus.html
index 6d4a847352..66314c4a09 100644
--- a/api/event-bus.html
+++ b/api/event-bus.html
@@ -402,7 +402,7 @@ <h3 id="argoproj.io/v1alpha1.JetStreamBus">JetStreamBus
 </em>
 </td>
 <td>
-<p>Redis StatefulSet size</p>
+<p>JetStream StatefulSet size</p>
 </td>
 </tr>
 <tr>
diff --git a/api/event-bus.md b/api/event-bus.md
index d26fe55ce0..1af65d8e46 100644
--- a/api/event-bus.md
+++ b/api/event-bus.md
@@ -399,7 +399,7 @@ JetStream version, such as “2.7.3”
 </td>
 <td>
 <p>
-Redis StatefulSet size
+JetStream StatefulSet size
 </p>
 </td>
 </tr>
diff --git a/api/jsonschema/schema.json b/api/jsonschema/schema.json
index 11067c1cda..d8b77f66dc 100644
--- a/api/jsonschema/schema.json
+++ b/api/jsonschema/schema.json
@@ -473,7 +473,7 @@
           "description": "ReloaderContainerTemplate contains customized spec for config reloader container"
         },
         "replicas": {
-          "description": "Redis StatefulSet size",
+          "description": "JetStream StatefulSet size",
           "format": "int32",
           "type": "integer"
         },
diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json
index b4e7ed480c..a23375abed 100644
--- a/api/openapi-spec/swagger.json
+++ b/api/openapi-spec/swagger.json
@@ -466,7 +466,7 @@
           "$ref": "#/definitions/io.argoproj.eventbus.v1alpha1.ContainerTemplate"
         },
         "replicas": {
-          "description": "Redis StatefulSet size",
+          "description": "JetStream StatefulSet size",
           "type": "integer",
           "format": "int32"
         },
diff --git a/controllers/eventbus/installer/jetstream.go b/controllers/eventbus/installer/jetstream.go
index 0fc808984a..034c9c0d62 100644
--- a/controllers/eventbus/installer/jetstream.go
+++ b/controllers/eventbus/installer/jetstream.go
@@ -557,7 +557,10 @@ func (r *jetStreamInstaller) createSecrets(ctx context.Context) error {
 		}
 
 		// Generate TLS self signed certificate for Jetstream cluster nodes: includes TLS private key, certificate, and CA certificate
-		clusterNodeHosts := []string{fmt.Sprintf("*.%s.%s.svc", generateJetStreamServiceName(r.eventBus), r.eventBus.Namespace)}
+		clusterNodeHosts := []string{
+			fmt.Sprintf("*.%s.%s.svc.cluster.local", generateJetStreamServiceName(r.eventBus), r.eventBus.Namespace),
+			fmt.Sprintf("*.%s.%s.svc", generateJetStreamServiceName(r.eventBus), r.eventBus.Namespace),
+		}
 		r.logger.Infof("cluster node hosts: %+v", clusterNodeHosts)
 		clusterKeyPEM, clusterCertPEM, clusterCACertPEM, err := tls.CreateCerts(certOrg, clusterNodeHosts, time.Now().Add(10*365*24*time.Hour), true, true) // expires in 10 years
 		if err != nil {
diff --git a/pkg/apis/eventbus/v1alpha1/generated.proto b/pkg/apis/eventbus/v1alpha1/generated.proto
index e03b4841a2..6e44617e2b 100644
--- a/pkg/apis/eventbus/v1alpha1/generated.proto
+++ b/pkg/apis/eventbus/v1alpha1/generated.proto
@@ -105,7 +105,7 @@ message JetStreamBus {
   // JetStream version, such as "2.7.3"
   optional string version = 1;
 
-  // Redis StatefulSet size
+  // JetStream StatefulSet size
   // +kubebuilder:default=3
   optional int32 replicas = 2;
 
diff --git a/pkg/apis/eventbus/v1alpha1/jetstream_eventbus.go b/pkg/apis/eventbus/v1alpha1/jetstream_eventbus.go
index 33e6d91fb4..97cad48fe2 100644
--- a/pkg/apis/eventbus/v1alpha1/jetstream_eventbus.go
+++ b/pkg/apis/eventbus/v1alpha1/jetstream_eventbus.go
@@ -9,7 +9,7 @@ import (
 type JetStreamBus struct {
 	// JetStream version, such as "2.7.3"
 	Version string `json:"version,omitempty" protobuf:"bytes,1,opt,name=version"`
-	// Redis StatefulSet size
+	// JetStream StatefulSet size
 	// +kubebuilder:default=3
 	Replicas *int32 `json:"replicas,omitempty" protobuf:"varint,2,opt,name=replicas"`
 	// ContainerTemplate contains customized spec for Nats JetStream container
diff --git a/pkg/apis/eventbus/v1alpha1/openapi_generated.go b/pkg/apis/eventbus/v1alpha1/openapi_generated.go
index 48babcac71..e2427fb6d4 100644
--- a/pkg/apis/eventbus/v1alpha1/openapi_generated.go
+++ b/pkg/apis/eventbus/v1alpha1/openapi_generated.go
@@ -302,7 +302,7 @@ func schema_pkg_apis_eventbus_v1alpha1_JetStreamBus(ref common.ReferenceCallback
 					},
 					"replicas": {
 						SchemaProps: spec.SchemaProps{
-							Description: "Redis StatefulSet size",
+							Description: "JetStream StatefulSet size",
 							Type:        []string{"integer"},
 							Format:      "int32",
 						},