diff --git a/charts/gitops-runtime/tests/eventbus_test.yaml b/charts/gitops-runtime/tests/eventbus_test.yaml
index b6ea09ea..37595ef3 100644
--- a/charts/gitops-runtime/tests/eventbus_test.yaml
+++ b/charts/gitops-runtime/tests/eventbus_test.yaml
@@ -30,16 +30,16 @@ tests:
       - notExists:
           path: spec.nats
 
-  - it: Should create an EventBus with the correct default name (nats)
+  - it: Should create an EventBus with the correct default name (jetstream)
     template: eventbus/codefresh-eventbus.yaml
     values:
       - ./values/mandatory-values.yaml
     set:
-      global.runtime.eventBus.type: nats
+      global.runtime.eventBus.type: jetstream
     asserts:
       - equal:
           path: metadata.name
-          value: codefresh-eventbus
+          value: codefresh-eventbus-jetstream
 
   - it: Should create an EventBus with the correct override name (nats)
     template: eventbus/codefresh-eventbus.yaml
diff --git a/charts/gitops-runtime/tests/global_constraints_test.yaml b/charts/gitops-runtime/tests/global_constraints_test.yaml
index 232a2a2d..c443781d 100644
--- a/charts/gitops-runtime/tests/global_constraints_test.yaml
+++ b/charts/gitops-runtime/tests/global_constraints_test.yaml
@@ -119,13 +119,13 @@ tests:
         template: event-reporters/workflow-reporter/sensor.yaml
       # -- codefresh-eventbus
       - equal:
-          path: spec.nats.native.nodeSelector
+          path: spec.jetstream.nodeSelector
           value:
             some-key: some-value
             extra-key: extra-value
         template: eventbus/codefresh-eventbus.yaml
       - equal:
-          path: spec.nats.native.tolerations
+          path: spec.jetstream.tolerations
           value:
           - key: some-key
             operator: Equal
@@ -456,13 +456,13 @@ tests:
         template: event-reporters/workflow-reporter/sensor.yaml
       # -- codefresh-eventbus
       - equal:
-          path: spec.nats.native.nodeSelector
+          path: spec.jetstream.nodeSelector
           value:
             some-key: another-value
             foo: bar
         template: eventbus/codefresh-eventbus.yaml
       - equal:
-          path: spec.nats.native.tolerations
+          path: spec.jetstream.tolerations
           value:
             - key: another-key
               operator: Equal
diff --git a/charts/gitops-runtime/tests/values/subcharts-constraints-values.yaml b/charts/gitops-runtime/tests/values/subcharts-constraints-values.yaml
index ede59046..aca70868 100644
--- a/charts/gitops-runtime/tests/values/subcharts-constraints-values.yaml
+++ b/charts/gitops-runtime/tests/values/subcharts-constraints-values.yaml
@@ -12,10 +12,9 @@ anchors:
 global:
   runtime:
     eventBus:
-      nats:
-        native:
-          nodeSelector: *nodeSelector
-          tolerations: *tolerations
+      jetstream:
+        nodeSelector: *nodeSelector
+        tolerations: *tolerations
 
 app-proxy:
   nodeSelector: *nodeSelector
diff --git a/charts/gitops-runtime/values.yaml b/charts/gitops-runtime/values.yaml
index ca09fede..ff9422eb 100644
--- a/charts/gitops-runtime/values.yaml
+++ b/charts/gitops-runtime/values.yaml
@@ -89,7 +89,7 @@ global:
         enabled: true
         # -- Minimum number of available eventbus pods. For eventbus to stay functional the majority of its replicas should always be available.
         minAvailable: 2
-      type: nats # -- Eventbus type. Can be nats or jetstream.
+      type: jetstream # -- Eventbus type. Can be nats or jetstream.
       nats:
         native:
           metadata: