diff --git a/serverlessworkflow/antora.yml b/serverlessworkflow/antora.yml
index a92f79b68..4ee2e0a09 100644
--- a/serverlessworkflow/antora.yml
+++ b/serverlessworkflow/antora.yml
@@ -27,24 +27,30 @@ nav:
 - "modules/ROOT/nav.adoc"
 asciidoc:
   attributes:
-    # for product names
-    #in Downstream product_name: OpenShift Serverless Logic
+    # 
+    # Names, labels and similar
+    #
     product_name: SonataFlow
-    # upstream: empty
-    #kogito_version_redhat: 1.24.0.Final-redhat-00001
-    kogito_version_redhat: ""
-    # same for upstream and downstream while the operator is community only
     operator_name: SonataFlow Operator
     operator_installation_namespace: sonataflow-operator-system
-    # upstream: io.quarkus.platform
-    #quarkus_platform: com.redhat.quarkus.platform
     quarkus_platform: io.quarkus.platform
-    # upstream: kogito-quarkus-serverless-workflow
-    # kogito_sw_ga: org.kie.kogito:kogito-quarkus-serverless-workflow
     kogito_sw_ga: kogito-quarkus-serverless-workflow
-    # downstream: 2.7.6.Final-redhat-00006
+    data_index_ref: Data Index
+    workflow_instance: workflow instance
+    workflow_instances: workflow instances
+    operator_openshift_keyword: sonataflow
+    operator_openshift_catalog: sonataflow-operator
+    operator_k8s_keyword: sonataflow
+    operator_k8s_subscription: my-sonataflow-operator
+    kogito_devservices_imagename: quay.io/kiegroup/kogito-data-index-ephemeral-nightly
+    sonataflow_devmode_imagename: quay.io/kiegroup/kogito-swf-devmode-nightly
+    sonataflow_builder_imagename: quay.io/kiegroup/kogito-swf-builder-nightly
+    sonataflow_devmode_devui_url: /q/dev/org.kie.kogito.kogito-quarkus-serverless-workflow-devui/
+
+    #
+    #  Versions 
+    #
     quarkus_version: 3.2.9.Final
-    # downstream: 2.7.6.Final-redhat-00006 (might be different to the quarkus_version)
     quarkus_platform_version: 3.2.9.Final
     java_min_version: 17+
     maven_min_version: 3.9.3
@@ -56,20 +62,17 @@ asciidoc:
     docker_min_version: 20.10.7
     docker_compose_min_version: 1.27.2
     kubernetes_version: 1.26
-    openshift_version_min: 4.10
+    openshift_version_min: 4.12
     openshift_version_max: 4.15
     knative_version: 1.13
     knative_serving_version: 1.13
     knative_eventing_version: 1.13
     # only used in downstream
     operator_version: main
-    # after TP1, change to Serverless Logic
-    operator_openshift_keyword: sonataflow
-    operator_openshift_catalog: sonataflow-operator
-    operator_k8s_keyword: sonataflow
-    operator_k8s_subscription: my-sonataflow-operator
-    kogito_devservices_imagename: registry.redhat.io/openshift-serverless-1-tech-preview/logic-data-index-ephemeral-rhel8
-    sonataflow_devmode_imagename: quay.io/kiegroup/kogito-swf-devmode
+
+    #
+    # URLs 
+    #
     kogito_examples_repository_url: https://github.com/apache/incubator-kie-kogito-examples
     kogito_sw_examples_url: https://github.com/apache/incubator-kie-kogito-examples/tree/main/serverless-workflow-examples
     kogito_sw_operator_examples_url: https://github.com/apache/incubator-kie-kogito-examples/tree/main/serverless-operator-examples
@@ -85,7 +88,7 @@ asciidoc:
     open_api_spec_url: https://spec.openapis.org/oas/v3.1.0.html
     open_api_swagger_spec_url: https://swagger.io/docs/specification
     quarkus_openapi_gen_url: https://github.com/quarkiverse/quarkus-openapi-generator
-    kie_tools_releases_page_url: https://github.com/kiegroup/kie-tools/releases
+    kie_tools_releases_page_url: https://github.com/apache/incubator-kie-tools/releases
     quarkus_guides_base_url: https://quarkus.io/guides
     quarkus_guides_kafka_url: https://quarkus.io/guides/kafka
     quarkus_guides_config_reference_url: https://quarkus.io/guides/config-reference
@@ -127,11 +130,9 @@ asciidoc:
     ocp_knative_eventing_url: https://docs.openshift.com/container-platform/4.12/serverless/install/installing-knative-eventing.html
     ocp_kn_cli_url: https://docs.openshift.com/container-platform/4.12/serverless/install/installing-kn.html
     serverless_workflow_vscode_extension_name: KIE Serverless Workflow Editor
-    # xreferences to documents within the documentation.
+
+    #
+    # xreferences to documents within the documentation
+    #
     data_index_xref: xref:data-index/data-index-core-concepts.adoc
     job_service_xref: xref:job-services/core-concepts.adoc
-    # string unication references
-    data_index_ref: Data Index
-    workflow_instance: workflow instance
-    workflow_instances: workflow instances
-    sonataflow_devmode_devui_url: /q/dev/org.kie.kogito.kogito-quarkus-serverless-workflow-devui/