diff --git a/charts/orchestrator-k8s/templates/sonataflow-operator.yaml b/charts/orchestrator-k8s/templates/sonataflow-operator.yaml
index 71c810c..bdf355c 100644
--- a/charts/orchestrator-k8s/templates/sonataflow-operator.yaml
+++ b/charts/orchestrator-k8s/templates/sonataflow-operator.yaml
@@ -554,7 +554,7 @@ subjects:
 apiVersion: v1
 data:
   DEFAULT_WORKFLOW_EXTENSION: .sw.json
-  Dockerfile: "FROM quay.io/kiegroup/kogito-swf-builder-nightly:latest AS builder\n\n# variables that can be overridden by the builder\n# To add a Quarkus extension to your application\nARG QUARKUS_EXTENSIONS\n# Args to pass to the Quarkus CLI add extension command\nARG QUARKUS_ADD_EXTENSION_ARGS\n# Additional java/mvn arguments to pass to the builder\nARG MAVEN_ARGS_APPEND\n\n# Copy from build context to skeleton resources project\nCOPY --chown=1001 . ./resources\n\nRUN /home/kogito/launch/build-app.sh ./resources\n  \n#=============================\n# Runtime Run\n#=============================\nFROM registry.access.redhat.com/ubi9/openjdk-17:latest\n\nENV LANG='en_US.UTF-8' LANGUAGE='en_US:en'\n  \n# We make four distinct layers so if there are application changes the library layers can be re-used\nCOPY --from=builder --chown=185 /home/kogito/serverless-workflow-project/target/quarkus-app/lib/ /deployments/lib/\nCOPY --from=builder --chown=185 /home/kogito/serverless-workflow-project/target/quarkus-app/*.jar /deployments/\nCOPY --from=builder --chown=185 /home/kogito/serverless-workflow-project/target/quarkus-app/app/ /deployments/app/\nCOPY --from=builder --chown=185 /home/kogito/serverless-workflow-project/target/quarkus-app/quarkus/ /deployments/quarkus/\n\nEXPOSE 8080\nUSER 185\nENV AB_JOLOKIA_OFF=\"\"\nENV JAVA_OPTS=\"-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager\"\nENV JAVA_APP_JAR=\"/deployments/quarkus-run.jar\"\n"
+  Dockerfile: "FROM quay.io/kubesmarts/incubator-kie-sonataflow-builder:main AS builder\n\n# variables that can be overridden by the builder\n# To add a Quarkus extension to your application\nARG QUARKUS_EXTENSIONS\n# Args to pass to the Quarkus CLI add extension command\nARG QUARKUS_ADD_EXTENSION_ARGS\n# Additional java/mvn arguments to pass to the builder\nARG MAVEN_ARGS_APPEND\n\n# Copy from build context to skeleton resources project\nCOPY --chown=1001 . ./resources\n\nRUN /home/kogito/launch/build-app.sh ./resources\n  \n#=============================\n# Runtime Run\n#=============================\nFROM registry.access.redhat.com/ubi9/openjdk-17:latest\n\nENV LANG='en_US.UTF-8' LANGUAGE='en_US:en'\n  \n# We make four distinct layers so if there are application changes the library layers can be re-used\nCOPY --from=builder --chown=185 /home/kogito/serverless-workflow-project/target/quarkus-app/lib/ /deployments/lib/\nCOPY --from=builder --chown=185 /home/kogito/serverless-workflow-project/target/quarkus-app/*.jar /deployments/\nCOPY --from=builder --chown=185 /home/kogito/serverless-workflow-project/target/quarkus-app/app/ /deployments/app/\nCOPY --from=builder --chown=185 /home/kogito/serverless-workflow-project/target/quarkus-app/quarkus/ /deployments/quarkus/\n\nEXPOSE 8080\nUSER 185\nENV AB_JOLOKIA_OFF=\"\"\nENV JAVA_OPTS=\"-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager\"\nENV JAVA_APP_JAR=\"/deployments/quarkus-run.jar\"\n"
 kind: ConfigMap
 metadata:
   name: sonataflow-operator-builder-config
@@ -644,7 +644,7 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-          image: quay.io/kiegroup/kogito-serverless-operator-nightly:latest
+          image: quay.io/kubesmarts/incubator-kie-sonataflow-operator:main
           livenessProbe:
             httpGet:
               path: /healthz
diff --git a/charts/orchestrator-k8s/templates/sonataflow-platform.yaml b/charts/orchestrator-k8s/templates/sonataflow-platform.yaml
index 1ca9851..961b2b6 100644
--- a/charts/orchestrator-k8s/templates/sonataflow-platform.yaml
+++ b/charts/orchestrator-k8s/templates/sonataflow-platform.yaml
@@ -10,7 +10,15 @@ spec:
       registry:
         address: quay.io/kiegroup
         secret: regcred
-
+  {{- if (and (.Values.platform.eventing.broker.name) (.Values.platform.eventing.broker.namespace)) }}
+  eventing:
+    broker:
+      ref:
+        apiVersion: eventing.knative.dev/v1
+        kind: Broker
+        name: {{ .Values.platform.eventing.broker.name }}
+        namespace: {{ .Values.platform.eventing.broker.namespace }}
+  {{- end }}
   services:
     dataIndex:
       enabled: true
diff --git a/charts/orchestrator-k8s/values.yaml b/charts/orchestrator-k8s/values.yaml
index dc931a2..8eef2ca 100644
--- a/charts/orchestrator-k8s/values.yaml
+++ b/charts/orchestrator-k8s/values.yaml
@@ -6,6 +6,15 @@ labels:
   - app: orchestartor
 sonataflowOperator:
   image: quay.io/kiegroup/kogito-serverless-operator-nightly:latest
+platform:
+  # eventing related fields
+  eventing:
+    # broker related fields
+    broker:
+      # name of the broker to use when creating triggers and sinkbindings
+      name: broker
+      # namespace where the broker is deployed
+      namespace: default
 postgresql-persistent:
   # depends on sonataflow-operator which still uses the ephemeral image.
   enabled: false