From b98827330e320a0fff8a0e4c9984dd832fa2f4ea Mon Sep 17 00:00:00 2001
From: Tiago Bento <tiagobentofernandes@gmail.com>
Date: Wed, 25 Sep 2024 15:40:31 -0400
Subject: [PATCH] Adapt the repo to use images migrated from `kogito-images`

---
 .ci/jenkins/shared-scripts/buildUtils.groovy  |  2 +-
 KOGITO_UPGRADE_PROCESS.md                     |  2 +-
 .../env/index.js                              |  2 +-
 packages/kn-plugin-workflow/env/index.js      |  2 +-
 .../maven-m2-repo-via-http-image/env/index.js |  2 +-
 .../maven-m2-repo-via-http-image/package.json |  2 +-
 .../env/index.js                              |  2 +-
 .../Containerfile                             |  4 +-
 .../env/index.js                              | 22 ++++---
 .../package.json                              |  3 +-
 .../env/index.js                              |  2 +-
 .../env/index.js                              |  4 +-
 .../package.json                              |  2 +-
 .../env/index.js                              |  2 +-
 .../Containerfile                             |  4 +-
 .../env/index.js                              | 18 ++---
 .../install.js                                |  2 +-
 .../package.json                              |  7 +-
 .../serverless-logic-web-tools/env/index.js   |  6 +-
 .../webpack.config.ts                         | 24 +++----
 .../sonataflow-builder-image/env/index.js     |  2 +-
 packages/sonataflow-builder-image/install.js  |  2 +-
 .../sonataflow-builder-image/package.json     |  2 +-
 .../sonataflow-devmode-image/env/index.js     |  2 +-
 packages/sonataflow-devmode-image/install.js  |  2 +-
 .../sonataflow-devmode-image/package.json     |  2 +-
 packages/sonataflow-operator/env/index.js     |  6 +-
 .../sonataflow-operator/hack/bump-version.sh  |  3 +-
 .../images/requirements.txt                   |  2 +-
 packages/sonataflow-operator/package.json     |  4 ++
 .../sonataflow-operator/version/version.go    |  2 +-
 pnpm-lock.yaml                                | 42 ++++++------
 repo/graph.dot                                |  7 +-
 repo/graph.json                               | 65 +++++++++++++------
 ...eck_required_preinstalled_cli_commands.mjs |  1 +
 .../update_kogito_version.js                  | 52 ++-------------
 36 files changed, 156 insertions(+), 154 deletions(-)

diff --git a/.ci/jenkins/shared-scripts/buildUtils.groovy b/.ci/jenkins/shared-scripts/buildUtils.groovy
index a10964f90f2..de24bb6fbb3 100644
--- a/.ci/jenkins/shared-scripts/buildUtils.groovy
+++ b/.ci/jenkins/shared-scripts/buildUtils.groovy
@@ -106,7 +106,7 @@ def pnpmUpdateProjectVersion(String projectVersion) {
 */
 def pnpmUpdateKogitoVersion(String kogitoVersion, String imagesTag) {
     sh """#!/bin/bash -el
-    pnpm update-kogito-version-to --maven ${kogitoVersion} --images-tag ${imagesTag}
+    pnpm update-kogito-version-to --maven ${kogitoVersion}
     """.trim()
 }
 
diff --git a/KOGITO_UPGRADE_PROCESS.md b/KOGITO_UPGRADE_PROCESS.md
index 4b74a31d4ef..2896b7f32b1 100644
--- a/KOGITO_UPGRADE_PROCESS.md
+++ b/KOGITO_UPGRADE_PROCESS.md
@@ -86,7 +86,7 @@ You can find an example of the Quarkus upgrade in [this PR](https://github.com/a
 
 # Upgrading Kogito
 
-In the root directory, run `pnpm update-kogito-version-to --maven [version] --images-tag [tag]`.
+In the root directory, run `pnpm update-kogito-version-to --maven [version]`.
 
 Of course, a new Kogito version may lead to incompatibilities in the code and with other dependencies. In such a case, an investigation and evetually a fix is required to complete the process.
 
diff --git a/packages/dev-deployment-kogito-quarkus-blank-app-image/env/index.js b/packages/dev-deployment-kogito-quarkus-blank-app-image/env/index.js
index db4e8b45097..7087fb761c4 100644
--- a/packages/dev-deployment-kogito-quarkus-blank-app-image/env/index.js
+++ b/packages/dev-deployment-kogito-quarkus-blank-app-image/env/index.js
@@ -52,7 +52,7 @@ module.exports = composeEnv([rootEnv], {
       description: "Tag version of this image. E.g., `main` or `10.0.x` or `10.0.0",
     },
     DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__mavenM2RepoViaHttpImage: {
-      default: `${mavenM2RepoViaHttpImageEnv.registry}/${mavenM2RepoViaHttpImageEnv.account}/${mavenM2RepoViaHttpImageEnv.name}:${mavenM2RepoViaHttpImageEnv.tag}`,
+      default: `${mavenM2RepoViaHttpImageEnv.registry}/${mavenM2RepoViaHttpImageEnv.account}/${mavenM2RepoViaHttpImageEnv.name}:${mavenM2RepoViaHttpImageEnv.buildTag}`,
       description: "The image tag for the Maven M2 Repo via HTTP. Used during the build only.",
     },
   }),
diff --git a/packages/kn-plugin-workflow/env/index.js b/packages/kn-plugin-workflow/env/index.js
index 81fdf4f1f29..a6ec7558357 100644
--- a/packages/kn-plugin-workflow/env/index.js
+++ b/packages/kn-plugin-workflow/env/index.js
@@ -35,7 +35,7 @@ module.exports = composeEnv([rootEnv, sonataflowDevModeImageEnv], {
       description: "Quarkus group to be used when creating the SonataFlow project",
     },
     KN_PLUGIN_WORKFLOW__devModeImageUrl: {
-      default: `${sonataflowDevModeImageEnv.env.sonataflowDevModeImage.registry}/${sonataflowDevModeImageEnv.env.sonataflowDevModeImage.account}/${sonataflowDevModeImageEnv.env.sonataflowDevModeImage.name}:${sonataflowDevModeImageEnv.env.sonataflowDevModeImage.tag}`,
+      default: `${sonataflowDevModeImageEnv.env.sonataflowDevModeImage.registry}/${sonataflowDevModeImageEnv.env.sonataflowDevModeImage.account}/${sonataflowDevModeImageEnv.env.sonataflowDevModeImage.name}:${sonataflowDevModeImageEnv.env.sonataflowDevModeImage.buildTag}`,
       description: "Kogito SWF DevMode image URL.",
     },
   }),
diff --git a/packages/maven-m2-repo-via-http-image/env/index.js b/packages/maven-m2-repo-via-http-image/env/index.js
index d989c25bd14..b5b8f0393be 100644
--- a/packages/maven-m2-repo-via-http-image/env/index.js
+++ b/packages/maven-m2-repo-via-http-image/env/index.js
@@ -46,7 +46,7 @@ module.exports = composeEnv([rootEnv], {
         registry: getOrDefault(this.vars.MAVEN_M2_REPO_VIA_HTTP_IMAGE__registry),
         account: getOrDefault(this.vars.MAVEN_M2_REPO_VIA_HTTP_IMAGE__account),
         name: getOrDefault(this.vars.MAVEN_M2_REPO_VIA_HTTP_IMAGE__name),
-        tag: getOrDefault(this.vars.MAVEN_M2_REPO_VIA_HTTP_IMAGE__buildTag),
+        buildTag: getOrDefault(this.vars.MAVEN_M2_REPO_VIA_HTTP_IMAGE__buildTag),
       },
     };
   },
diff --git a/packages/maven-m2-repo-via-http-image/package.json b/packages/maven-m2-repo-via-http-image/package.json
index 4fc49abc485..342622b2cd4 100644
--- a/packages/maven-m2-repo-via-http-image/package.json
+++ b/packages/maven-m2-repo-via-http-image/package.json
@@ -16,7 +16,7 @@
     "build": "run-script-if --bool \"$(build-env containerImages.build)\" --then \"pnpm image:docker:build\"",
     "build:dev": "pnpm build",
     "build:prod": "pnpm build",
-    "image:docker:build": "kie-tools--image-builder build -r \"$(build-env mavenM2RepoViaHttpImage.registry)\" -a \"$(build-env mavenM2RepoViaHttpImage.account)\" -n \"$(build-env mavenM2RepoViaHttpImage.name)\" -t \"$(build-env mavenM2RepoViaHttpImage.tag)\""
+    "image:docker:build": "kie-tools--image-builder build -r \"$(build-env mavenM2RepoViaHttpImage.registry)\" -a \"$(build-env mavenM2RepoViaHttpImage.account)\" -n \"$(build-env mavenM2RepoViaHttpImage.name)\" -t \"$(build-env mavenM2RepoViaHttpImage.buildTag)\""
   },
   "devDependencies": {
     "@kie-tools/image-builder": "workspace:*",
diff --git a/packages/serverless-logic-web-tools-base-builder-image-env/env/index.js b/packages/serverless-logic-web-tools-base-builder-image-env/env/index.js
index afdfe513458..1978806b118 100644
--- a/packages/serverless-logic-web-tools-base-builder-image-env/env/index.js
+++ b/packages/serverless-logic-web-tools-base-builder-image-env/env/index.js
@@ -42,7 +42,7 @@ module.exports = composeEnv([rootEnv], {
   }),
   get env() {
     return {
-      baseBuilderImageEnv: {
+      slwtBaseBuilderImageEnv: {
         registry: getOrDefault(this.vars.SERVERLESS_LOGIC_WEB_TOOLS__baseBuilderImageRegistry),
         account: getOrDefault(this.vars.SERVERLESS_LOGIC_WEB_TOOLS__baseBuilderImageAccount),
         name: getOrDefault(this.vars.SERVERLESS_LOGIC_WEB_TOOLS__baseBuilderImageName),
diff --git a/packages/serverless-logic-web-tools-base-builder-image/Containerfile b/packages/serverless-logic-web-tools-base-builder-image/Containerfile
index b5c59c044f7..59434a0a31d 100644
--- a/packages/serverless-logic-web-tools-base-builder-image/Containerfile
+++ b/packages/serverless-logic-web-tools-base-builder-image/Containerfile
@@ -15,9 +15,9 @@
 # specific language governing permissions and limitations
 # under the License.
 
-ARG KOGITO_IMAGE_TAG
+ARG BASE_IMAGE_TAG
 
-FROM --platform=linux/amd64 docker.io/apache/incubator-kie-kogito-base-builder:$KOGITO_IMAGE_TAG
+FROM --platform=linux/amd64 $BASE_IMAGE_TAG
 
 ARG KUBECTL_VERSION
 
diff --git a/packages/serverless-logic-web-tools-base-builder-image/env/index.js b/packages/serverless-logic-web-tools-base-builder-image/env/index.js
index e3eaefd9787..15c0e91d75f 100644
--- a/packages/serverless-logic-web-tools-base-builder-image/env/index.js
+++ b/packages/serverless-logic-web-tools-base-builder-image/env/index.js
@@ -19,26 +19,28 @@
 
 const { varsWithName, getOrDefault, composeEnv } = require("@kie-tools-scripts/build-env");
 
+const {
+  env: { kogitoBaseBuilderImage: kogitoBaseBuilderImageEnv },
+} = require("@kie/kogito-base-builder-image/env");
+
 module.exports = composeEnv(
   [require("@kie-tools/root-env/env"), require("@kie-tools/serverless-logic-web-tools-base-builder-image-env/env")],
   {
     vars: varsWithName({
-      SERVERLESS_LOGIC_WEB_TOOLS__baseBuilderKubectlVersion: {
+      SERVERLESS_LOGIC_WEB_TOOLS_BASE_BUILDER_IMAGE__kubectlVersion: {
         default: "v1.27.3",
-        description: "",
+        description: "kubectl version to install.",
       },
-      /* (begin) This part of the file is referenced in `scripts/update-kogito-version` */
-      SERVERLESS_LOGIC_WEB_TOOLS__baseBuilderKogitoImageTag: {
-        default: "main-20240905",
-        description: "",
+      SERVERLESS_LOGIC_WEB_TOOLS_BASE_BUILDER_IMAGE__baseImageTag: {
+        default: `${kogitoBaseBuilderImageEnv.registry}/${kogitoBaseBuilderImageEnv.account}/${kogitoBaseBuilderImageEnv.name}:${kogitoBaseBuilderImageEnv.buildTag}`,
+        description: "Base image complete tag.",
       },
-      /* end */
     }),
     get env() {
       return {
-        baseBuilderImage: {
-          kubectlVersion: getOrDefault(this.vars.SERVERLESS_LOGIC_WEB_TOOLS__baseBuilderKubectlVersion),
-          kogitoImageTag: getOrDefault(this.vars.SERVERLESS_LOGIC_WEB_TOOLS__baseBuilderKogitoImageTag),
+        slwtBaseBuilderImage: {
+          kubectlVersion: getOrDefault(this.vars.SERVERLESS_LOGIC_WEB_TOOLS_BASE_BUILDER_IMAGE__kubectlVersion),
+          baseImageTag: getOrDefault(this.vars.SERVERLESS_LOGIC_WEB_TOOLS_BASE_BUILDER_IMAGE__baseImageTag),
         },
       };
     },
diff --git a/packages/serverless-logic-web-tools-base-builder-image/package.json b/packages/serverless-logic-web-tools-base-builder-image/package.json
index 1a579ec1422..e43d512b064 100644
--- a/packages/serverless-logic-web-tools-base-builder-image/package.json
+++ b/packages/serverless-logic-web-tools-base-builder-image/package.json
@@ -18,11 +18,12 @@
     "build:prod:linux:darwin": "run-script-if --bool \"$(build-env containerImages.build)\" --then \"pnpm image:docker:build\"",
     "build:prod:win32": "echo \"Build not supported on Windows\"",
     "cleanup": "rimraf dist-dev && mkdir dist-dev",
-    "image:docker:build": "run-script-if --bool $([ $(command -v docker) ] && echo true || echo false) --then \"docker build --ulimit nofile=5000:5000 $(echo $(build-env baseBuilderImageEnv.buildTag) | xargs printf -- \"-t $(build-env baseBuilderImageEnv.registry)/$(build-env baseBuilderImageEnv.account)/$(build-env baseBuilderImageEnv.name):%s\n\" | xargs echo) --build-arg KOGITO_IMAGE_TAG=$(build-env baseBuilderImage.kogitoImageTag) --build-arg KUBECTL_VERSION=$(build-env baseBuilderImage.kubectlVersion) .\" --else \"echo Docker not found, skipping image build.\""
+    "image:docker:build": "run-script-if --bool $([ $(command -v docker) ] && echo true || echo false) --then \"docker build --ulimit nofile=5000:5000 $(echo $(build-env slwtBaseBuilderImageEnv.buildTag) | xargs printf -- \"-t $(build-env slwtBaseBuilderImageEnv.registry)/$(build-env slwtBaseBuilderImageEnv.account)/$(build-env slwtBaseBuilderImageEnv.name):%s\n\" | xargs echo) --build-arg BASE_IMAGE_TAG=$(build-env slwtBaseBuilderImage.baseImageTag) --build-arg KUBECTL_VERSION=$(build-env slwtBaseBuilderImage.kubectlVersion) .\" --else \"echo Docker not found, skipping image build.\""
   },
   "devDependencies": {
     "@kie-tools/root-env": "workspace:*",
     "@kie-tools/serverless-logic-web-tools-base-builder-image-env": "workspace:*",
+    "@kie/kogito-base-builder-image": "workspace:*",
     "rimraf": "^3.0.2",
     "run-script-os": "^1.1.6"
   }
diff --git a/packages/serverless-logic-web-tools-swf-builder-image-env/env/index.js b/packages/serverless-logic-web-tools-swf-builder-image-env/env/index.js
index 12c1289cada..0f2c264d380 100644
--- a/packages/serverless-logic-web-tools-swf-builder-image-env/env/index.js
+++ b/packages/serverless-logic-web-tools-swf-builder-image-env/env/index.js
@@ -42,7 +42,7 @@ module.exports = composeEnv([rootEnv], {
   }),
   get env() {
     return {
-      swfBuilderImageEnv: {
+      slwtBuilderImageEnv: {
         registry: getOrDefault(this.vars.SERVERLESS_LOGIC_WEB_TOOLS__swfBuilderImageRegistry),
         account: getOrDefault(this.vars.SERVERLESS_LOGIC_WEB_TOOLS__swfBuilderImageAccount),
         name: getOrDefault(this.vars.SERVERLESS_LOGIC_WEB_TOOLS__swfBuilderImageName),
diff --git a/packages/serverless-logic-web-tools-swf-builder-image/env/index.js b/packages/serverless-logic-web-tools-swf-builder-image/env/index.js
index 86df3331a33..0efda095d0b 100644
--- a/packages/serverless-logic-web-tools-swf-builder-image/env/index.js
+++ b/packages/serverless-logic-web-tools-swf-builder-image/env/index.js
@@ -26,13 +26,13 @@ const sonataflowBuilderImageEnv = require("@kie-tools/sonataflow-builder-image/e
 module.exports = composeEnv([rootEnv, serverlessLogicWebToolsSwfBuilderImageEnv, sonataflowBuilderImageEnv], {
   vars: varsWithName({
     SERVERLESS_LOGIC_WEB_TOOLS_SWF_BUILDER_IMAGE__baseImageUrl: {
-      default: `${sonataflowBuilderImageEnv.env.sonataflowBuilderImage.registry}/${sonataflowBuilderImageEnv.env.sonataflowBuilderImage.account}/${sonataflowBuilderImageEnv.env.sonataflowBuilderImage.name}:${sonataflowBuilderImageEnv.env.sonataflowBuilderImage.tag}`,
+      default: `${sonataflowBuilderImageEnv.env.sonataflowBuilderImage.registry}/${sonataflowBuilderImageEnv.env.sonataflowBuilderImage.account}/${sonataflowBuilderImageEnv.env.sonataflowBuilderImage.name}:${sonataflowBuilderImageEnv.env.sonataflowBuilderImage.buildTag}`,
       description: "The image used in the FROM import.",
     },
   }),
   get env() {
     return {
-      swfBuilderImage: {
+      slwtBuilderImage: {
         baseImageUrl: getOrDefault(this.vars.SERVERLESS_LOGIC_WEB_TOOLS_SWF_BUILDER_IMAGE__baseImageUrl),
       },
     };
diff --git a/packages/serverless-logic-web-tools-swf-builder-image/package.json b/packages/serverless-logic-web-tools-swf-builder-image/package.json
index 7309aa8324e..d86f263f4cd 100644
--- a/packages/serverless-logic-web-tools-swf-builder-image/package.json
+++ b/packages/serverless-logic-web-tools-swf-builder-image/package.json
@@ -21,7 +21,7 @@
     "cleanup": "rimraf dist-dev && mkdir dist-dev",
     "copy:assets": "pnpm copy:webapp",
     "copy:webapp": "cp -r ./node_modules/sonataflow-deployment-webapp/dist dist-dev/webapp",
-    "image:docker:build": "run-script-if --bool $([ $(command -v docker) ] && echo true || echo false) --then \"docker build --ulimit nofile=5000:5000 $(echo $(build-env swfBuilderImageEnv.buildTag) | xargs printf -- \"-t $(build-env swfBuilderImageEnv.registry)/$(build-env swfBuilderImageEnv.account)/$(build-env swfBuilderImageEnv.name):%s\n\" | xargs echo) --build-arg BASE_IMAGE_URL=$(build-env swfBuilderImage.baseImageUrl) .\" --else \"echo Docker not found, skipping image build.\""
+    "image:docker:build": "run-script-if --bool $([ $(command -v docker) ] && echo true || echo false) --then \"docker build --ulimit nofile=5000:5000 $(echo $(build-env slwtBuilderImageEnv.buildTag) | xargs printf -- \"-t $(build-env slwtBuilderImageEnv.registry)/$(build-env slwtBuilderImageEnv.account)/$(build-env slwtBuilderImageEnv.name):%s\n\" | xargs echo) --build-arg BASE_IMAGE_URL=$(build-env slwtBuilderImage.baseImageUrl) .\" --else \"echo Docker not found, skipping image build.\""
   },
   "devDependencies": {
     "@kie-tools/root-env": "workspace:*",
diff --git a/packages/serverless-logic-web-tools-swf-dev-mode-image-env/env/index.js b/packages/serverless-logic-web-tools-swf-dev-mode-image-env/env/index.js
index bc9514484a1..804d8ff6bd6 100644
--- a/packages/serverless-logic-web-tools-swf-dev-mode-image-env/env/index.js
+++ b/packages/serverless-logic-web-tools-swf-dev-mode-image-env/env/index.js
@@ -42,7 +42,7 @@ module.exports = composeEnv([rootEnv], {
   }),
   get env() {
     return {
-      swfDevModeImageEnv: {
+      slwtDevModeImageEnv: {
         registry: getOrDefault(this.vars.SERVERLESS_LOGIC_WEB_TOOLS__swfDevModeImageRegistry),
         account: getOrDefault(this.vars.SERVERLESS_LOGIC_WEB_TOOLS__swfDevModeImageAccount),
         name: getOrDefault(this.vars.SERVERLESS_LOGIC_WEB_TOOLS__swfDevModeImageName),
diff --git a/packages/serverless-logic-web-tools-swf-dev-mode-image/Containerfile b/packages/serverless-logic-web-tools-swf-dev-mode-image/Containerfile
index 48395f4882c..1038ffd3cc4 100644
--- a/packages/serverless-logic-web-tools-swf-dev-mode-image/Containerfile
+++ b/packages/serverless-logic-web-tools-swf-dev-mode-image/Containerfile
@@ -15,9 +15,9 @@
 # specific language governing permissions and limitations
 # under the License.
 
-ARG KOGITO_IMAGE_TAG
+ARG BASE_IMAGE_TAG
 
-FROM --platform=linux/amd64 docker.io/apache/incubator-kie-kogito-base-builder:$KOGITO_IMAGE_TAG
+FROM --platform=linux/amd64 $BASE_IMAGE_TAG
 
 ENV PATH="${PATH}:/usr/share/maven/bin"
 
diff --git a/packages/serverless-logic-web-tools-swf-dev-mode-image/env/index.js b/packages/serverless-logic-web-tools-swf-dev-mode-image/env/index.js
index 434d3870172..1c29373cc23 100644
--- a/packages/serverless-logic-web-tools-swf-dev-mode-image/env/index.js
+++ b/packages/serverless-logic-web-tools-swf-dev-mode-image/env/index.js
@@ -25,24 +25,26 @@ const {
   env: { mavenM2RepoViaHttpImage: mavenM2RepoViaHttpImageEnv },
 } = require("@kie-tools/maven-m2-repo-via-http-image/env");
 
+const {
+  env: { kogitoBaseBuilderImage: kogitoBaseBuilderImageEnv },
+} = require("@kie/kogito-base-builder-image/env");
+
 module.exports = composeEnv([rootEnv, require("@kie-tools/serverless-logic-web-tools-swf-dev-mode-image-env/env")], {
   vars: varsWithName({
-    /* (begin) This part of the file is referenced in `scripts/update-kogito-version` */
-    SERVERLESS_LOGIC_WEB_TOOLS_DEVMODE_IMAGE__kogitoBaseBuilderImageTag: {
-      default: "main-20240905",
-      description: "",
+    SERVERLESS_LOGIC_WEB_TOOLS_DEVMODE_IMAGE__baseImageTag: {
+      default: `${kogitoBaseBuilderImageEnv.registry}/${kogitoBaseBuilderImageEnv.account}/${kogitoBaseBuilderImageEnv.name}:${kogitoBaseBuilderImageEnv.buildTag}`,
+      description: "Base image complete tag.",
     },
-    /* end */
     SERVERLESS_LOGIC_WEB_TOOLS_DEVMODE_IMAGE__mavenM2RepoViaHttpImage: {
-      default: `${mavenM2RepoViaHttpImageEnv.registry}/${mavenM2RepoViaHttpImageEnv.account}/${mavenM2RepoViaHttpImageEnv.name}:${mavenM2RepoViaHttpImageEnv.tag}`,
+      default: `${mavenM2RepoViaHttpImageEnv.registry}/${mavenM2RepoViaHttpImageEnv.account}/${mavenM2RepoViaHttpImageEnv.name}:${mavenM2RepoViaHttpImageEnv.buildTag}`,
       description: "The image tag for the Maven M2 Repo via HTTP. Used during the build only.",
     },
   }),
   get env() {
     return {
-      swfDevModeImage: {
+      slwtDevModeImage: {
+        baseImageTag: getOrDefault(this.vars.SERVERLESS_LOGIC_WEB_TOOLS_DEVMODE_IMAGE__baseImageTag),
         version: require("../package.json").version,
-        kogitoImageTag: getOrDefault(this.vars.SERVERLESS_LOGIC_WEB_TOOLS_DEVMODE_IMAGE__kogitoBaseBuilderImageTag),
         dev: {
           mavenM2RepoViaHttpImage: getOrDefault(
             this.vars.SERVERLESS_LOGIC_WEB_TOOLS_DEVMODE_IMAGE__mavenM2RepoViaHttpImage
diff --git a/packages/serverless-logic-web-tools-swf-dev-mode-image/install.js b/packages/serverless-logic-web-tools-swf-dev-mode-image/install.js
index 94df8d4a2e8..6a812f4a2e6 100644
--- a/packages/serverless-logic-web-tools-swf-dev-mode-image/install.js
+++ b/packages/serverless-logic-web-tools-swf-dev-mode-image/install.js
@@ -21,5 +21,5 @@ const buildEnv = require("./env");
 const { setup } = require("@kie-tools/maven-config-setup-helper");
 
 setup(`
-    -Drevision=${buildEnv.env.swfDevModeImage.version}
+    -Drevision=${buildEnv.env.slwtDevModeImage.version}
 `);
diff --git a/packages/serverless-logic-web-tools-swf-dev-mode-image/package.json b/packages/serverless-logic-web-tools-swf-dev-mode-image/package.json
index b9a76e09952..f395d8d6393 100644
--- a/packages/serverless-logic-web-tools-swf-dev-mode-image/package.json
+++ b/packages/serverless-logic-web-tools-swf-dev-mode-image/package.json
@@ -26,11 +26,11 @@
     "copy:sonataflow-deployment-webapp": "run-script-os",
     "copy:sonataflow-deployment-webapp:linux:darwin": "cp -R ./node_modules/sonataflow-deployment-webapp/dist/* ./dist-dev/quarkus-app/src/main/resources/META-INF/resources",
     "copy:sonataflow-deployment-webapp:win32": "pnpm powershell \"Copy-Item -R ./node_modules/sonataflow-deployment-webapp/dist/* ./dist-dev/quarkus-app/src/main/resources/META-INF/resources\"",
-    "image:docker:build": "kie-tools--image-builder build --allowHostNetworkAccess -r \"$(build-env swfDevModeImageEnv.registry)\" -a \"$(build-env swfDevModeImageEnv.account)\" -n \"$(build-env swfDevModeImageEnv.name)\" -t \"$(build-env swfDevModeImageEnv.buildTag)\" --build-arg KOGITO_IMAGE_TAG=\"$(build-env swfDevModeImage.kogitoImageTag)\"",
-    "image:docker:squash": ". ./node_modules/@kie-tools/python-venv/venv/bin/activate && DOCKER_HOST=$(docker context inspect | jq '.[].Endpoints.docker.Host' | tr -d '\"') docker-squash -t $(build-env swfDevModeImageEnv.registry)/$(build-env swfDevModeImageEnv.account)/$(build-env swfDevModeImageEnv.name):$(build-env swfDevModeImageEnv.buildTag) $(build-env swfDevModeImageEnv.registry)/$(build-env swfDevModeImageEnv.account)/$(build-env swfDevModeImageEnv.name):$(build-env swfDevModeImageEnv.buildTag)",
+    "image:docker:build": "kie-tools--image-builder build --allowHostNetworkAccess -r \"$(build-env slwtDevModeImageEnv.registry)\" -a \"$(build-env slwtDevModeImageEnv.account)\" -n \"$(build-env slwtDevModeImageEnv.name)\" -t \"$(build-env slwtDevModeImageEnv.buildTag)\" --build-arg BASE_IMAGE_TAG=\"$(build-env slwtDevModeImage.baseImageTag)\"",
+    "image:docker:squash": ". ./node_modules/@kie-tools/python-venv/venv/bin/activate && DOCKER_HOST=$(docker context inspect | jq '.[].Endpoints.docker.Host' | tr -d '\"') docker-squash -t $(build-env slwtDevModeImageEnv.registry)/$(build-env slwtDevModeImageEnv.account)/$(build-env slwtDevModeImageEnv.name):$(build-env slwtDevModeImageEnv.buildTag) $(build-env slwtDevModeImageEnv.registry)/$(build-env slwtDevModeImageEnv.account)/$(build-env slwtDevModeImageEnv.name):$(build-env slwtDevModeImageEnv.buildTag)",
     "install": "node install.js",
     "m2-repo-via-http:container:kill": "(docker container kill m2-repo-via-http || true) && (docker container rm m2-repo-via-http || true)",
-    "m2-repo-via-http:container:run": "(pnpm m2-repo-via-http:container:kill || true) && docker run --name m2-repo-via-http -v \"$(mvn help:evaluate -Dexpression=settings.localRepository -q -DforceStdout):/var/www/html\" -dit $(build-env swfDevModeImage.dev.mavenM2RepoViaHttpImage)",
+    "m2-repo-via-http:container:run": "(pnpm m2-repo-via-http:container:kill || true) && docker run --name m2-repo-via-http -v \"$(mvn help:evaluate -Dexpression=settings.localRepository -q -DforceStdout):/var/www/html\" -dit $(build-env slwtDevModeImage.dev.mavenM2RepoViaHttpImage)",
     "powershell": "@powershell -NoProfile -ExecutionPolicy Unrestricted -Command"
   },
   "devDependencies": {
@@ -41,6 +41,7 @@
     "@kie-tools/root-env": "workspace:*",
     "@kie-tools/serverless-logic-web-tools-swf-deployment-quarkus-app": "workspace:*",
     "@kie-tools/serverless-logic-web-tools-swf-dev-mode-image-env": "workspace:*",
+    "@kie/kogito-base-builder-image": "workspace:*",
     "rimraf": "^3.0.2",
     "run-script-os": "^1.1.6",
     "sonataflow-deployment-webapp": "workspace:*"
diff --git a/packages/serverless-logic-web-tools/env/index.js b/packages/serverless-logic-web-tools/env/index.js
index 41004e01ce5..01c2c8611fb 100644
--- a/packages/serverless-logic-web-tools/env/index.js
+++ b/packages/serverless-logic-web-tools/env/index.js
@@ -86,16 +86,16 @@ module.exports = composeEnv(
             cypressUrl: getOrDefault(this.vars.SERVERLESS_LOGIC_WEB_TOOLS__cypressUrl),
             port: 9020,
           },
-          swfBuilderImage: {
+          slwtBuilderImageEnv: {
             tag: getOrDefault(this.vars.SERVERLESS_LOGIC_WEB_TOOLS__swfBuilderImageTag),
           },
-          baseBuilderImage: {
+          slwtBaseBuilderImage: {
             tag: getOrDefault(this.vars.SERVERLESS_LOGIC_WEB_TOOLS__baseBuilderImageTag),
           },
           dashbuilderViewerImage: {
             tag: getOrDefault(this.vars.SERVERLESS_LOGIC_WEB_TOOLS__dashbuilderViewerImageTag),
           },
-          swfDevModeImage: {
+          slwtDevModeImage: {
             tag: getOrDefault(this.vars.SERVERLESS_LOGIC_WEB_TOOLS__swfDevModeImageTag),
           },
           corsProxyUrl: getOrDefault(this.vars.SERVERLESS_LOGIC_WEB_TOOLS__corsProxyUrl),
diff --git a/packages/serverless-logic-web-tools/webpack.config.ts b/packages/serverless-logic-web-tools/webpack.config.ts
index 689a4aa196e..961ee98cb09 100644
--- a/packages/serverless-logic-web-tools/webpack.config.ts
+++ b/packages/serverless-logic-web-tools/webpack.config.ts
@@ -220,10 +220,10 @@ export default async (env: any, argv: any) => {
 };
 
 function getSwfBuilderImageArgs() {
-  const swfBuilderImageRegistry = buildEnv.swfBuilderImageEnv.registry;
-  const swfBuilderImageAccount = buildEnv.swfBuilderImageEnv.account;
-  const swfBuilderImageName = buildEnv.swfBuilderImageEnv.name;
-  const swfBuilderImageTag = buildEnv.serverlessLogicWebTools.swfBuilderImage.tag;
+  const swfBuilderImageRegistry = buildEnv.slwtBuilderImageEnv.registry;
+  const swfBuilderImageAccount = buildEnv.slwtBuilderImageEnv.account;
+  const swfBuilderImageName = buildEnv.slwtBuilderImageEnv.name;
+  const swfBuilderImageTag = buildEnv.serverlessLogicWebTools.slwtBuilderImageEnv.tag;
 
   console.info("Serverless Logic Web Tools :: SWF Builder Image Registry: " + swfBuilderImageRegistry);
   console.info("Serverless Logic Web Tools :: SWF Builder Image Account: " + swfBuilderImageAccount);
@@ -234,10 +234,10 @@ function getSwfBuilderImageArgs() {
 }
 
 function getSwfDevModeImageArgs() {
-  const swfDevModeImageRegistry = buildEnv.swfDevModeImageEnv.registry;
-  const swfDevModeImageAccount = buildEnv.swfDevModeImageEnv.account;
-  const swfDevModeImageName = buildEnv.swfDevModeImageEnv.name;
-  const swfDevModeImageTag = buildEnv.serverlessLogicWebTools.swfDevModeImage.tag;
+  const swfDevModeImageRegistry = buildEnv.slwtDevModeImageEnv.registry;
+  const swfDevModeImageAccount = buildEnv.slwtDevModeImageEnv.account;
+  const swfDevModeImageName = buildEnv.slwtDevModeImageEnv.name;
+  const swfDevModeImageTag = buildEnv.serverlessLogicWebTools.slwtDevModeImage.tag;
 
   console.info("Serverless Logic Web Tools :: Dev Mode Image Registry: " + swfDevModeImageRegistry);
   console.info("Serverless Logic Web Tools :: Dev Mode Image Account: " + swfDevModeImageAccount);
@@ -248,10 +248,10 @@ function getSwfDevModeImageArgs() {
 }
 
 function getBaseBuilderImageArgs() {
-  const baseBuilderImageRegistry = buildEnv.baseBuilderImageEnv.registry;
-  const baseBuilderImageAccount = buildEnv.baseBuilderImageEnv.account;
-  const baseBuilderImageName = buildEnv.baseBuilderImageEnv.name;
-  const baseBuilderImageTag = buildEnv.serverlessLogicWebTools.baseBuilderImage.tag;
+  const baseBuilderImageRegistry = buildEnv.slwtBaseBuilderImageEnv.registry;
+  const baseBuilderImageAccount = buildEnv.slwtBaseBuilderImageEnv.account;
+  const baseBuilderImageName = buildEnv.slwtBaseBuilderImageEnv.name;
+  const baseBuilderImageTag = buildEnv.serverlessLogicWebTools.slwtBaseBuilderImage.tag;
 
   console.info("Serverless Logic Web Tools :: Base Builder Image Registry: " + baseBuilderImageRegistry);
   console.info("Serverless Logic Web Tools :: Base Builder Image Account: " + baseBuilderImageAccount);
diff --git a/packages/sonataflow-builder-image/env/index.js b/packages/sonataflow-builder-image/env/index.js
index a2032324056..36e3cc1181e 100644
--- a/packages/sonataflow-builder-image/env/index.js
+++ b/packages/sonataflow-builder-image/env/index.js
@@ -46,7 +46,7 @@ module.exports = composeEnv([rootEnv], {
         registry: getOrDefault(this.vars.SONATAFLOW_BUILDER_IMAGE__registry),
         account: getOrDefault(this.vars.SONATAFLOW_BUILDER_IMAGE__account),
         name: getOrDefault(this.vars.SONATAFLOW_BUILDER_IMAGE__name),
-        tag: getOrDefault(this.vars.SONATAFLOW_BUILDER_IMAGE__buildTag),
+        buildTag: getOrDefault(this.vars.SONATAFLOW_BUILDER_IMAGE__buildTag),
       },
     };
   },
diff --git a/packages/sonataflow-builder-image/install.js b/packages/sonataflow-builder-image/install.js
index b3a511cbcc0..00f6c3a3bbf 100644
--- a/packages/sonataflow-builder-image/install.js
+++ b/packages/sonataflow-builder-image/install.js
@@ -33,7 +33,7 @@ const activateCmd =
 
 execSync(
   `${activateCmd} && \
-  python3 ${sonataflowImageCommonDir}/resources/scripts/versions_manager.py --bump-to ${buildEnv.env.sonataflowBuilderImage.tag} --source-folder ./resources`,
+  python3 ${sonataflowImageCommonDir}/resources/scripts/versions_manager.py --bump-to ${buildEnv.env.sonataflowBuilderImage.buildTag} --source-folder ./resources`,
   { stdio: "inherit" }
 );
 
diff --git a/packages/sonataflow-builder-image/package.json b/packages/sonataflow-builder-image/package.json
index 2994231beba..3c4463d089e 100644
--- a/packages/sonataflow-builder-image/package.json
+++ b/packages/sonataflow-builder-image/package.json
@@ -27,7 +27,7 @@
     "image:test:darwin:win32": "echo \"Tests skipped on macOS and Windows\"",
     "image:test:linux": "pnpm copy-test-assets && pnpm setup:env make -C ./build test-image",
     "install": "node install.js && pnpm format",
-    "setup:env": ". ./node_modules/@kie-tools/python-venv/venv/bin/activate && cross-env KOGITO_IMAGE_REGISTRY=$(build-env sonataflowBuilderImage.registry) KOGITO_IMAGE_REGISTRY_ACCOUNT=$(build-env sonataflowBuilderImage.account) KOGITO_IMAGE_NAME=$(build-env sonataflowBuilderImage.name) KOGITO_IMAGE_TAG=$(build-env sonataflowBuilderImage.tag) QUARKUS_PLATFORM_VERSION=$(build-env quarkusPlatform.version) KOGITO_VERSION=$(build-env kogitoRuntime.version)",
+    "setup:env": ". ./node_modules/@kie-tools/python-venv/venv/bin/activate && cross-env KOGITO_IMAGE_REGISTRY=$(build-env sonataflowBuilderImage.registry) KOGITO_IMAGE_REGISTRY_ACCOUNT=$(build-env sonataflowBuilderImage.account) KOGITO_IMAGE_NAME=$(build-env sonataflowBuilderImage.name) KOGITO_IMAGE_TAG=$(build-env sonataflowBuilderImage.buildTag) QUARKUS_PLATFORM_VERSION=$(build-env quarkusPlatform.version) KOGITO_VERSION=$(build-env kogitoRuntime.version)",
     "test": "run-script-os",
     "test:cleanup": "mv dist-tests/report.xml dist-tests/junit-report.xml || true",
     "test:linux:darwin": "run-script-if --bool \"$(build-env tests.run)\" --then \"pnpm test:setup\" \"pnpm test:run\" --finally \"pnpm test:cleanup\"",
diff --git a/packages/sonataflow-devmode-image/env/index.js b/packages/sonataflow-devmode-image/env/index.js
index c67f4995769..6b741da955c 100644
--- a/packages/sonataflow-devmode-image/env/index.js
+++ b/packages/sonataflow-devmode-image/env/index.js
@@ -51,7 +51,7 @@ module.exports = composeEnv([rootEnv], {
         registry: getOrDefault(this.vars.SONATAFLOW_DEVMODE_IMAGE__registry),
         account: getOrDefault(this.vars.SONATAFLOW_DEVMODE_IMAGE__account),
         name: getOrDefault(this.vars.SONATAFLOW_DEVMODE_IMAGE__name),
-        tag: getOrDefault(this.vars.SONATAFLOW_DEVMODE_IMAGE__buildTag),
+        buildTag: getOrDefault(this.vars.SONATAFLOW_DEVMODE_IMAGE__buildTag),
         sonataflowQuarkusDevUiVersion: getOrDefault(this.vars.SONATAFLOW_DEVMODE_IMAGE__sonataflowQuarkusDevUiVersion),
       },
     };
diff --git a/packages/sonataflow-devmode-image/install.js b/packages/sonataflow-devmode-image/install.js
index de22bb2875c..f701da5c030 100644
--- a/packages/sonataflow-devmode-image/install.js
+++ b/packages/sonataflow-devmode-image/install.js
@@ -33,7 +33,7 @@ const activateCmd =
 
 execSync(
   `${activateCmd} && \
-  python3 ${sonataflowImageCommonDir}/resources/scripts/versions_manager.py --bump-to ${buildEnv.env.sonataflowDevModeImage.tag} --source-folder ./resources`,
+  python3 ${sonataflowImageCommonDir}/resources/scripts/versions_manager.py --bump-to ${buildEnv.env.sonataflowDevModeImage.buildTag} --source-folder ./resources`,
   { stdio: "inherit" }
 );
 
diff --git a/packages/sonataflow-devmode-image/package.json b/packages/sonataflow-devmode-image/package.json
index 69e5c6d828d..4a2843d4a25 100644
--- a/packages/sonataflow-devmode-image/package.json
+++ b/packages/sonataflow-devmode-image/package.json
@@ -28,7 +28,7 @@
     "image:test:linux": "pnpm copy-test-assets && pnpm setup:env make -C ./build test-image",
     "image:test:win32": "echo \"Tests skipped on Windows\"",
     "install": "node install.js && pnpm format",
-    "setup:env": ". ./node_modules/@kie-tools/python-venv/venv/bin/activate && cross-env KOGITO_IMAGE_REGISTRY=$(build-env sonataflowDevModeImage.registry) KOGITO_IMAGE_REGISTRY_ACCOUNT=$(build-env sonataflowDevModeImage.account) KOGITO_IMAGE_NAME=$(build-env sonataflowDevModeImage.name) KOGITO_IMAGE_TAG=$(build-env sonataflowDevModeImage.tag) QUARKUS_PLATFORM_VERSION=$(build-env quarkusPlatform.version) KOGITO_VERSION=$(build-env kogitoRuntime.version) SONATAFLOW_QUARKUS_DEVUI_VERSION=$(build-env sonataflowDevModeImage.sonataflowQuarkusDevUiVersion)"
+    "setup:env": ". ./node_modules/@kie-tools/python-venv/venv/bin/activate && cross-env KOGITO_IMAGE_REGISTRY=$(build-env sonataflowDevModeImage.registry) KOGITO_IMAGE_REGISTRY_ACCOUNT=$(build-env sonataflowDevModeImage.account) KOGITO_IMAGE_NAME=$(build-env sonataflowDevModeImage.name) KOGITO_IMAGE_TAG=$(build-env sonataflowDevModeImage.buildTag) QUARKUS_PLATFORM_VERSION=$(build-env quarkusPlatform.version) KOGITO_VERSION=$(build-env kogitoRuntime.version) SONATAFLOW_QUARKUS_DEVUI_VERSION=$(build-env sonataflowDevModeImage.sonataflowQuarkusDevUiVersion)"
   },
   "devDependencies": {
     "@kie-tools/python-venv": "workspace:*",
diff --git a/packages/sonataflow-operator/env/index.js b/packages/sonataflow-operator/env/index.js
index bb7dff616d4..fdb5568d930 100644
--- a/packages/sonataflow-operator/env/index.js
+++ b/packages/sonataflow-operator/env/index.js
@@ -42,11 +42,11 @@ module.exports = composeEnv([rootEnv, sonataflowBuilderImageEnv, sonataflowDevMo
       description: "Tag version of this image. E.g., `main` or `10.0.x` or `10.0.0",
     },
     SONATAFLOW_OPERATOR__sonataflowBuilderImage: {
-      default: `${sonataflowBuilderImageEnv.env.sonataflowBuilderImage.registry}/${sonataflowBuilderImageEnv.env.sonataflowBuilderImage.account}/${sonataflowBuilderImageEnv.env.sonataflowBuilderImage.name}:${sonataflowBuilderImageEnv.env.sonataflowBuilderImage.tag}`,
+      default: `${sonataflowBuilderImageEnv.env.sonataflowBuilderImage.registry}/${sonataflowBuilderImageEnv.env.sonataflowBuilderImage.account}/${sonataflowBuilderImageEnv.env.sonataflowBuilderImage.name}:${sonataflowBuilderImageEnv.env.sonataflowBuilderImage.buildTag}`,
       description: "Sonataflow Builder image",
     },
     SONATAFLOW_OPERATOR__sonataflowDevModeImage: {
-      default: `${sonataflowDevModeImageEnv.env.sonataflowDevModeImage.registry}/${sonataflowDevModeImageEnv.env.sonataflowDevModeImage.account}/${sonataflowDevModeImageEnv.env.sonataflowDevModeImage.name}:${sonataflowDevModeImageEnv.env.sonataflowDevModeImage.tag}`,
+      default: `${sonataflowDevModeImageEnv.env.sonataflowDevModeImage.registry}/${sonataflowDevModeImageEnv.env.sonataflowDevModeImage.account}/${sonataflowDevModeImageEnv.env.sonataflowDevModeImage.name}:${sonataflowDevModeImageEnv.env.sonataflowDevModeImage.buildTag}`,
       description: "Sonataflow DevMode image",
     },
   }),
@@ -56,7 +56,7 @@ module.exports = composeEnv([rootEnv, sonataflowBuilderImageEnv, sonataflowDevMo
         registry: getOrDefault(this.vars.SONATAFLOW_OPERATOR__registry),
         account: getOrDefault(this.vars.SONATAFLOW_OPERATOR__account),
         name: getOrDefault(this.vars.SONATAFLOW_OPERATOR__name),
-        tag: getOrDefault(this.vars.SONATAFLOW_OPERATOR__buildTag),
+        buildTag: getOrDefault(this.vars.SONATAFLOW_OPERATOR__buildTag),
         version: require("../package.json").version,
         sonataflowBuilderImage: getOrDefault(this.vars.SONATAFLOW_OPERATOR__sonataflowBuilderImage),
         sonataflowDevModeImage: getOrDefault(this.vars.SONATAFLOW_OPERATOR__sonataflowDevModeImage),
diff --git a/packages/sonataflow-operator/hack/bump-version.sh b/packages/sonataflow-operator/hack/bump-version.sh
index e2b131e7b35..1db411598a8 100755
--- a/packages/sonataflow-operator/hack/bump-version.sh
+++ b/packages/sonataflow-operator/hack/bump-version.sh
@@ -24,7 +24,7 @@ script_dir_path=$(dirname "${BASH_SOURCE[0]}")
 source "${script_dir_path}"/env.sh
 
 imageName=$(pnpm build-env sontaflowOperator.registry)/$(pnpm build-env sontaflowOperator.account)/$(pnpm build-env sontaflowOperator.name)
-imageTag=$(pnpm build-env sontaflowOperator.tag)
+imageTag=$(pnpm build-env sontaflowOperator.buildTag)
 version=$(pnpm build-env sontaflowOperator.version)
 
 targetSonataflowBuilderImage=$(pnpm build-env sontaflowOperator.sonataflowBuilderImage)
@@ -60,6 +60,7 @@ node -p "require('replace-in-file').sync({ from: /sonataflow-operator-system\/so
 
 node -p "require('replace-in-file').sync({ from: /\bOperatorVersion = .*/g, to: 'OperatorVersion = \"${version}\"', files: ['version/version.go'] });"
 node -p "require('replace-in-file').sync({ from: /\btagVersion = .*/g, to: 'tagVersion = \"${imageTag}\"', files: ['version/version.go'] });"
+node -p "require('replace-in-file').sync({ from: /\bkogitoImagesTagVersion = .*/g, to: 'kogitoImagesTagVersion = \"${imageTag}\"', files: ['version/version.go'] });"
 node -p "require('replace-in-file').sync({ from: /\bcontainerImage:.*\b/g, to: 'containerImage: ${targetSonataflowOperatorImage}', files: ['$(getCsvFile)'] });"
 
 make generate-all
diff --git a/packages/sonataflow-operator/images/requirements.txt b/packages/sonataflow-operator/images/requirements.txt
index 87a0ef5117c..c0ed2e16a76 100644
--- a/packages/sonataflow-operator/images/requirements.txt
+++ b/packages/sonataflow-operator/images/requirements.txt
@@ -1,4 +1,4 @@
-# Requirements for cekit 4.11.0 build
+# Requirements for cekit 4.12.0 build
 # see: https://pip.pypa.io/en/stable/reference/requirements-file-format/
 docker-squash
 odcs
diff --git a/packages/sonataflow-operator/package.json b/packages/sonataflow-operator/package.json
index 25cdd5e4a5d..846d641b45a 100644
--- a/packages/sonataflow-operator/package.json
+++ b/packages/sonataflow-operator/package.json
@@ -40,6 +40,10 @@
     "@kie-tools/root-env": "workspace:*",
     "@kie-tools/sonataflow-builder-image": "workspace:*",
     "@kie-tools/sonataflow-devmode-image": "workspace:*",
+    "@kie/kogito-data-index-ephemeral-image": "workspace:*",
+    "@kie/kogito-data-index-postgresql-image": "workspace:*",
+    "@kie/kogito-jobs-service-ephemeral-image": "workspace:*",
+    "@kie/kogito-jobs-service-postgresql-image": "workspace:*",
     "replace-in-file": "^7.1.0",
     "rimraf": "^3.0.2",
     "run-script-os": "^1.1.6"
diff --git a/packages/sonataflow-operator/version/version.go b/packages/sonataflow-operator/version/version.go
index e028d4226d7..5cfd5fae728 100644
--- a/packages/sonataflow-operator/version/version.go
+++ b/packages/sonataflow-operator/version/version.go
@@ -32,7 +32,7 @@ const (
 	// For example, docker.io/apache/incubator-kie-sonataflow-operator:main -> 10.0
 	tagVersion = "main"
 	// Kogito images tag version. Used for data-index and jobs-service images.
-	kogitoImagesTagVersion = "main-20240905"
+	kogitoImagesTagVersion = "main"
 	// OpenJDK image tag version
 	openJDKImageTagVersion = "1.20"
 )
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 836f60d9ab4..c32ba9b016c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -9606,6 +9606,9 @@ importers:
       '@kie-tools/serverless-logic-web-tools-base-builder-image-env':
         specifier: workspace:*
         version: link:../serverless-logic-web-tools-base-builder-image-env
+      '@kie/kogito-base-builder-image':
+        specifier: workspace:*
+        version: link:../kogito-base-builder-image
       rimraf:
         specifier: ^3.0.2
         version: 3.0.2
@@ -9685,6 +9688,9 @@ importers:
       '@kie-tools/serverless-logic-web-tools-swf-dev-mode-image-env':
         specifier: workspace:*
         version: link:../serverless-logic-web-tools-swf-dev-mode-image-env
+      '@kie/kogito-base-builder-image':
+        specifier: workspace:*
+        version: link:../kogito-base-builder-image
       rimraf:
         specifier: ^3.0.2
         version: 3.0.2
@@ -11463,6 +11469,18 @@ importers:
       '@kie-tools/sonataflow-devmode-image':
         specifier: workspace:*
         version: link:../sonataflow-devmode-image
+      '@kie/kogito-data-index-ephemeral-image':
+        specifier: workspace:*
+        version: link:../kogito-data-index-ephemeral-image
+      '@kie/kogito-data-index-postgresql-image':
+        specifier: workspace:*
+        version: link:../kogito-data-index-postgresql-image
+      '@kie/kogito-jobs-service-ephemeral-image':
+        specifier: workspace:*
+        version: link:../kogito-jobs-service-ephemeral-image
+      '@kie/kogito-jobs-service-postgresql-image':
+        specifier: workspace:*
+        version: link:../kogito-jobs-service-postgresql-image
       replace-in-file:
         specifier: ^7.1.0
         version: 7.1.0
@@ -22869,10 +22887,6 @@ packages:
     resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==}
     engines: {node: '>=6'}
 
-  escalade@3.1.2:
-    resolution: {integrity: sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==}
-    engines: {node: '>=6'}
-
   escalade@3.2.0:
     resolution: {integrity: sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==}
     engines: {node: '>=6'}
@@ -28757,10 +28771,6 @@ packages:
     resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==}
     engines: {node: '>=8'}
 
-  strip-ansi@7.0.1:
-    resolution: {integrity: sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==}
-    engines: {node: '>=12'}
-
   strip-ansi@7.1.0:
     resolution: {integrity: sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==}
     engines: {node: '>=12'}
@@ -38033,7 +38043,7 @@ snapshots:
     dependencies:
       string-width: 5.1.2
       string-width-cjs: string-width@4.2.3
-      strip-ansi: 7.0.1
+      strip-ansi: 7.1.0
       strip-ansi-cjs: strip-ansi@6.0.1
       wrap-ansi: 8.1.0
       wrap-ansi-cjs: wrap-ansi@7.0.0
@@ -48144,8 +48154,6 @@ snapshots:
 
   escalade@3.1.1: {}
 
-  escalade@3.1.2: {}
-
   escalade@3.2.0: {}
 
   escape-html@1.0.3: {}
@@ -56101,7 +56109,7 @@ snapshots:
     dependencies:
       eastasianwidth: 0.2.0
       emoji-regex: 9.2.2
-      strip-ansi: 7.0.1
+      strip-ansi: 7.1.0
 
   string-width@7.2.0:
     dependencies:
@@ -56179,10 +56187,6 @@ snapshots:
     dependencies:
       ansi-regex: 5.0.1
 
-  strip-ansi@7.0.1:
-    dependencies:
-      ansi-regex: 6.0.1
-
   strip-ansi@7.1.0:
     dependencies:
       ansi-regex: 6.0.1
@@ -57525,7 +57529,7 @@ snapshots:
   update-browserslist-db@1.0.13(browserslist@4.23.0):
     dependencies:
       browserslist: 4.23.0
-      escalade: 3.1.1
+      escalade: 3.2.0
       picocolors: 1.0.1
 
   update-browserslist-db@1.1.0(browserslist@4.23.2):
@@ -58745,7 +58749,7 @@ snapshots:
     dependencies:
       ansi-styles: 6.2.1
       string-width: 5.1.2
-      strip-ansi: 7.0.1
+      strip-ansi: 7.1.0
 
   wrap-ansi@9.0.0:
     dependencies:
@@ -58925,7 +58929,7 @@ snapshots:
   yargs@17.7.2:
     dependencies:
       cliui: 8.0.1
-      escalade: 3.1.2
+      escalade: 3.2.0
       get-caller-file: 2.0.5
       require-directory: 2.1.1
       string-width: 4.2.3
diff --git a/repo/graph.dot b/repo/graph.dot
index a883d69cce4..d7c98c77dbc 100644
--- a/repo/graph.dot
+++ b/repo/graph.dot
@@ -538,6 +538,7 @@ digraph G {
   "@kie-tools/serverless-logic-web-tools" -> "@kie-tools/serverless-logic-web-tools-swf-dev-mode-image-env" [ style = "dashed", color = "black" ];
   "@kie-tools/serverless-logic-web-tools" -> "@kie-tools/sonataflow-dev-app" [ style = "dashed", color = "black" ];
   "@kie-tools/serverless-logic-web-tools-base-builder-image" -> "@kie-tools/serverless-logic-web-tools-base-builder-image-env" [ style = "dashed", color = "black" ];
+  "@kie-tools/serverless-logic-web-tools-base-builder-image" -> "@kie/kogito-base-builder-image" [ style = "dashed", color = "black" ];
   "@kie-tools/serverless-logic-web-tools-base-builder-image-env" -> "@kie-tools/root-env" [ style = "dashed", color = "black" ];
   "@kie-tools/serverless-logic-web-tools-swf-builder-image" -> "@kie-tools/serverless-logic-web-tools-swf-builder-image-env" [ style = "dashed", color = "black" ];
   "@kie-tools/serverless-logic-web-tools-swf-builder-image" -> "@kie-tools/sonataflow-builder-image" [ style = "dashed", color = "black" ];
@@ -545,9 +546,9 @@ digraph G {
   "@kie-tools/serverless-logic-web-tools-swf-builder-image-env" -> "@kie-tools/root-env" [ style = "dashed", color = "black" ];
   "@kie-tools/serverless-logic-web-tools-swf-deployment-quarkus-app" -> "@kie-tools/sonataflow-quarkus-devui" [ style = "solid", color = "black" ];
   "@kie-tools/serverless-logic-web-tools-swf-dev-mode-image" -> "@kie-tools/maven-m2-repo-via-http-image" [ style = "dashed", color = "black" ];
-  "@kie-tools/serverless-logic-web-tools-swf-dev-mode-image" -> "@kie-tools/python-venv" [ style = "dashed", color = "black" ];
   "@kie-tools/serverless-logic-web-tools-swf-dev-mode-image" -> "@kie-tools/serverless-logic-web-tools-swf-deployment-quarkus-app" [ style = "dashed", color = "black" ];
   "@kie-tools/serverless-logic-web-tools-swf-dev-mode-image" -> "@kie-tools/serverless-logic-web-tools-swf-dev-mode-image-env" [ style = "dashed", color = "black" ];
+  "@kie-tools/serverless-logic-web-tools-swf-dev-mode-image" -> "@kie/kogito-base-builder-image" [ style = "dashed", color = "black" ];
   "@kie-tools/serverless-logic-web-tools-swf-dev-mode-image" -> "sonataflow-deployment-webapp" [ style = "dashed", color = "black" ];
   "@kie-tools/serverless-logic-web-tools-swf-dev-mode-image-env" -> "@kie-tools/root-env" [ style = "dashed", color = "black" ];
   "@kie-tools/serverless-workflow-combined-editor" -> "@kie-tools/serverless-workflow-diagram-editor-assets" [ style = "solid", color = "blue" ];
@@ -598,6 +599,10 @@ digraph G {
   "@kie-tools/sonataflow-management-console-webapp" -> "@kie-tools/sonataflow-dev-app" [ style = "dashed", color = "blue" ];
   "@kie-tools/sonataflow-operator" -> "@kie-tools/sonataflow-builder-image" [ style = "dashed", color = "black" ];
   "@kie-tools/sonataflow-operator" -> "@kie-tools/sonataflow-devmode-image" [ style = "dashed", color = "black" ];
+  "@kie-tools/sonataflow-operator" -> "@kie/kogito-data-index-ephemeral-image" [ style = "dashed", color = "black" ];
+  "@kie-tools/sonataflow-operator" -> "@kie/kogito-data-index-postgresql-image" [ style = "dashed", color = "black" ];
+  "@kie-tools/sonataflow-operator" -> "@kie/kogito-jobs-service-ephemeral-image" [ style = "dashed", color = "black" ];
+  "@kie-tools/sonataflow-operator" -> "@kie/kogito-jobs-service-postgresql-image" [ style = "dashed", color = "black" ];
   "@kie-tools/sonataflow-quarkus-devui" -> "@kie-tools/serverless-workflow-dev-ui-webapp" [ style = "dashed", color = "black" ];
   "@kie-tools/storybook-base" -> "@kie-tools-core/webpack-base" [ style = "dashed", color = "blue" ];
   "@kie-tools/storybook-base" -> "@kie-tools/eslint" [ style = "dashed", color = "blue" ];
diff --git a/repo/graph.json b/repo/graph.json
index ff9fbefac0c..d0b1cd4a282 100644
--- a/repo/graph.json
+++ b/repo/graph.json
@@ -154,15 +154,15 @@
       { "id": "@kie-tools/sonataflow-operator" },
       { "id": "@kie-tools/sonataflow-builder-image" },
       { "id": "@kie-tools/sonataflow-devmode-image" },
+      { "id": "@kie/kogito-data-index-ephemeral-image" },
+      { "id": "@kie/kogito-data-index-postgresql-image" },
+      { "id": "@kie/kogito-jobs-service-ephemeral-image" },
+      { "id": "@kie/kogito-jobs-service-postgresql-image" },
       { "id": "@kie/kogito-base-builder-image" },
       { "id": "@kie-tools/sonataflow-image-common" },
       { "id": "@kie-tools/python-venv" },
-      { "id": "@kie/kogito-data-index-ephemeral-image" },
-      { "id": "@kie/kogito-data-index-postgresql-image" },
       { "id": "@kie/kogito-jit-runner-image" },
       { "id": "@kie/kogito-jobs-service-allinone-image" },
-      { "id": "@kie/kogito-jobs-service-ephemeral-image" },
-      { "id": "@kie/kogito-jobs-service-postgresql-image" },
       { "id": "@kie-tools/unitables" },
       { "id": "pmml-vscode-extension" },
       { "id": "@kie-tools/runtime-tools-components" },
@@ -1920,6 +1920,26 @@
         "target": "@kie-tools/sonataflow-devmode-image",
         "weight": 1
       },
+      {
+        "source": "@kie-tools/sonataflow-operator",
+        "target": "@kie/kogito-data-index-ephemeral-image",
+        "weight": 1
+      },
+      {
+        "source": "@kie-tools/sonataflow-operator",
+        "target": "@kie/kogito-data-index-postgresql-image",
+        "weight": 1
+      },
+      {
+        "source": "@kie-tools/sonataflow-operator",
+        "target": "@kie/kogito-jobs-service-ephemeral-image",
+        "weight": 1
+      },
+      {
+        "source": "@kie-tools/sonataflow-operator",
+        "target": "@kie/kogito-jobs-service-postgresql-image",
+        "weight": 1
+      },
       {
         "source": "@kie-tools/sonataflow-builder-image",
         "target": "@kie-tools/sonataflow-image-common",
@@ -1936,47 +1956,47 @@
         "weight": 1
       },
       {
-        "source": "@kie/kogito-base-builder-image",
+        "source": "@kie/kogito-data-index-ephemeral-image",
         "target": "@kie-tools/sonataflow-image-common",
         "weight": 1
       },
       {
-        "source": "@kie-tools/sonataflow-image-common",
-        "target": "@kie-tools/python-venv",
+        "source": "@kie/kogito-data-index-postgresql-image",
+        "target": "@kie-tools/sonataflow-image-common",
         "weight": 1
       },
       {
-        "source": "@kie-tools/sonataflow-image-common",
-        "target": "@kie-tools/root-env",
+        "source": "@kie/kogito-jobs-service-ephemeral-image",
+        "target": "@kie-tools/sonataflow-image-common",
         "weight": 1
       },
       {
-        "source": "@kie/kogito-data-index-ephemeral-image",
+        "source": "@kie/kogito-jobs-service-postgresql-image",
         "target": "@kie-tools/sonataflow-image-common",
         "weight": 1
       },
       {
-        "source": "@kie/kogito-data-index-postgresql-image",
+        "source": "@kie/kogito-base-builder-image",
         "target": "@kie-tools/sonataflow-image-common",
         "weight": 1
       },
       {
-        "source": "@kie/kogito-jit-runner-image",
-        "target": "@kie-tools/sonataflow-image-common",
+        "source": "@kie-tools/sonataflow-image-common",
+        "target": "@kie-tools/python-venv",
         "weight": 1
       },
       {
-        "source": "@kie/kogito-jobs-service-allinone-image",
-        "target": "@kie-tools/sonataflow-image-common",
+        "source": "@kie-tools/sonataflow-image-common",
+        "target": "@kie-tools/root-env",
         "weight": 1
       },
       {
-        "source": "@kie/kogito-jobs-service-ephemeral-image",
+        "source": "@kie/kogito-jit-runner-image",
         "target": "@kie-tools/sonataflow-image-common",
         "weight": 1
       },
       {
-        "source": "@kie/kogito-jobs-service-postgresql-image",
+        "source": "@kie/kogito-jobs-service-allinone-image",
         "target": "@kie-tools/sonataflow-image-common",
         "weight": 1
       },
@@ -2270,6 +2290,11 @@
         "target": "@kie-tools/serverless-logic-web-tools-base-builder-image-env",
         "weight": 1
       },
+      {
+        "source": "@kie-tools/serverless-logic-web-tools-base-builder-image",
+        "target": "@kie/kogito-base-builder-image",
+        "weight": 1
+      },
       {
         "source": "@kie-tools/serverless-logic-web-tools-swf-builder-image",
         "target": "@kie-tools/serverless-logic-web-tools-swf-builder-image-env",
@@ -2317,17 +2342,17 @@
       },
       {
         "source": "@kie-tools/serverless-logic-web-tools-swf-dev-mode-image",
-        "target": "@kie-tools/python-venv",
+        "target": "@kie-tools/serverless-logic-web-tools-swf-deployment-quarkus-app",
         "weight": 1
       },
       {
         "source": "@kie-tools/serverless-logic-web-tools-swf-dev-mode-image",
-        "target": "@kie-tools/serverless-logic-web-tools-swf-deployment-quarkus-app",
+        "target": "@kie-tools/serverless-logic-web-tools-swf-dev-mode-image-env",
         "weight": 1
       },
       {
         "source": "@kie-tools/serverless-logic-web-tools-swf-dev-mode-image",
-        "target": "@kie-tools/serverless-logic-web-tools-swf-dev-mode-image-env",
+        "target": "@kie/kogito-base-builder-image",
         "weight": 1
       },
       {
diff --git a/scripts/bootstrap/check_required_preinstalled_cli_commands.mjs b/scripts/bootstrap/check_required_preinstalled_cli_commands.mjs
index 02f725435a8..6930f85d62f 100755
--- a/scripts/bootstrap/check_required_preinstalled_cli_commands.mjs
+++ b/scripts/bootstrap/check_required_preinstalled_cli_commands.mjs
@@ -34,6 +34,7 @@ const argsByCommand = new Map([
   ["python3", ["--version"]],
   ["pip3", ["--version"]],
   ["s2i", ["version"]],
+  ["xmllint", ["-version"]],
 ]);
 
 async function main() {
diff --git a/scripts/update-kogito-version/update_kogito_version.js b/scripts/update-kogito-version/update_kogito_version.js
index eff803cf607..df2396eb796 100755
--- a/scripts/update-kogito-version/update_kogito_version.js
+++ b/scripts/update-kogito-version/update_kogito_version.js
@@ -22,16 +22,15 @@ const path = require("path");
 const execSync = require("child_process").execSync;
 
 const newMavenVersion = process.argv[3];
-const newImagesTag = process.argv[5];
 if (!newMavenVersion) {
-  console.error("Usage 'node update_kogito_version.js --maven [version] --images-tag [tag]'");
+  console.error("Usage 'node update_kogito_version.js --maven [version]");
   return 1;
 }
 
-if (process.argv[2] !== "--maven" || process.argv[4] !== "--images-tag") {
+if (process.argv[2] !== "--maven") {
   console.error("Arguments need to be passed in the correct order.");
   console.error(`Argv: ${process.argv.join(", ")}`);
-  console.error("Usage 'node update_kogito_version.js --maven [version] --images-tag [tag]'");
+  console.error("Usage 'node update_kogito_version.js --maven [version]");
   process.exit(1);
 }
 
@@ -50,56 +49,13 @@ try {
       )
   );
 
-  console.info("[update-kogito-version] Updating 'serverless-logic-web-tools-base-builder-image/env/index.js'...");
-  const serverlessLogicWebToolsBaseBuilderImageEnvPath = path.resolve(
-    __dirname,
-    "../../packages/serverless-logic-web-tools-base-builder-image/env/index.js"
-  );
-  fs.writeFileSync(
-    serverlessLogicWebToolsBaseBuilderImageEnvPath,
-    fs
-      .readFileSync(serverlessLogicWebToolsBaseBuilderImageEnvPath, "utf-8")
-      .replace(
-        /SERVERLESS_LOGIC_WEB_TOOLS__baseBuilderKogitoImageTag:[\s\n]*{[\s\n]*default:[\s\n]*".*"/,
-        `SERVERLESS_LOGIC_WEB_TOOLS__baseBuilderKogitoImageTag: {\n        default: "${newImagesTag}"`
-      )
-  );
-
-  console.info(
-    "[update-kogito-version] Updating 'packages/serverless-logic-web-tools-swf-dev-mode-image/env/index.js'..."
-  );
-  const serverlessLogicWebToolsSwfDevModeImageEnvPath = path.resolve(
-    __dirname,
-    "../../packages/serverless-logic-web-tools-swf-dev-mode-image/env/index.js"
-  );
-  fs.writeFileSync(
-    serverlessLogicWebToolsSwfDevModeImageEnvPath,
-    fs
-      .readFileSync(serverlessLogicWebToolsSwfDevModeImageEnvPath, "utf-8")
-      .replace(
-        /SERVERLESS_LOGIC_WEB_TOOLS_DEVMODE_IMAGE__kogitoBaseBuilderImageTag:[\s\n]*{[\s\n]*default:[\s\n]*".*"/,
-        `SERVERLESS_LOGIC_WEB_TOOLS_DEVMODE_IMAGE__kogitoBaseBuilderImageTag: {\n        default: "${newImagesTag}"`
-      )
-  );
-
-  console.info("[update-kogito-version] Updating 'packages/sonataflow-operator/version/version.go'...");
-  const sonataflowOperatorVersionsGo = path.resolve(__dirname, "../../packages/sonataflow-operator/version/version.go");
-  fs.writeFileSync(
-    sonataflowOperatorVersionsGo,
-    fs
-      .readFileSync(sonataflowOperatorVersionsGo, "utf-8")
-      .replace(/kogitoImagesTagVersion = ".*"/, `kogitoImagesTagVersion = "${newImagesTag}"`)
-  );
-
   console.info(`[update-kogito-version] Bootstrapping with updated Kogito version...`);
   execSync(`pnpm bootstrap`, execOpts);
 
   console.info(`[update-kogito-version] Formatting files...`);
   execSync(`pnpm pretty-quick`, execOpts);
 
-  console.info(
-    `[update-kogito-version] Updated Kogito to '${newMavenVersion}' (Maven) and '${newImagesTag}' (Images tag).`
-  );
+  console.info(`[update-kogito-version] Updated Kogito to '${newMavenVersion}' (Maven)`);
   console.info(`[update-kogito-version] Done.`);
 } catch (error) {
   console.error(error);