diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index dcdb0180..18beb0c4 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -41,8 +41,7 @@ jobs:
         build-args: |
           WF_RESOURCES=${{ inputs.workflow_id }}/
           MAVEN_ARGS_APPEND=-Dkogito.persistence.type=jdbc -Dquarkus.datasource.db-kind=postgresql -Dkogito.persistence.proto.marshaller=false
-          QUARKUS_EXTENSIONS=org.kie.kogito:kogito-addons-quarkus-jobs-knative-eventing:999-SNAPSHOT,org.kie:kie-addons-quarkus-persistence-jdbc:999-20240317-SNAPSHOT,io.quarkus:quarkus-jdbc-postgresql:3.2.9.Final,io.quarkus:quarkus-agroal:3.2.9.Final
-
+          QUARKUS_EXTENSIONS=org.kie.kogito:kogito-addons-quarkus-jobs-knative-eventing:9.99.1.redhat-00003,org.kie:kie-addons-quarkus-persistence-jdbc:999-20240317-SNAPSHOT,io.quarkus:quarkus-jdbc-postgresql:3.2.9.Final,io.quarkus:quarkus-agroal:3.2.9.Final
     - name: Buildah push to OCI Arcive
       if: ${{ inputs.it_mode }}
       run: |
diff --git a/Makefile b/Makefile
index ec5b1cb5..4b837fef 100644
--- a/Makefile
+++ b/Makefile
@@ -78,7 +78,9 @@ DEPLOYMENT_REPO ?= parodos-dev/serverless-workflows-config
 DEPLOYMENT_BRANCH ?= main
 
 # extra extensions needed for persistence at build time.
-QUARKUS_EXTENSIONS=org.kie.kogito:kogito-addons-quarkus-jobs-knative-eventing:999-SNAPSHOT,org.kie:kie-addons-quarkus-persistence-jdbc:999-20240317-SNAPSHOT,io.quarkus:quarkus-jdbc-postgresql:3.2.9.Final,io.quarkus:quarkus-agroal:3.2.9.Final
+# The extentions listed below are included in the cache in the image or available from maven central repository
+# The image is quay.io/kiegroup/kogito-swf-builder:9.99.1.CR1
+QUARKUS_EXTENSIONS=org.kie.kogito:kogito-addons-quarkus-jobs-knative-eventing:9.99.1.redhat-00003,org.kie:kie-addons-quarkus-persistence-jdbc:999-20240317-SNAPSHOT,io.quarkus:quarkus-jdbc-postgresql:3.2.9.Final,io.quarkus:quarkus-agroal:3.2.9.Final
 
 # build time properties required for persistence.
 MAVEN_ARGS_APPEND="-Dkogito.persistence.type=jdbc -Dquarkus.datasource.db-kind=postgresql -Dkogito.persistence.proto.marshaller=false"
diff --git a/pipeline/workflow-builder-dev.Dockerfile b/pipeline/workflow-builder-dev.Dockerfile
index 858b886e..7a36a29e 100644
--- a/pipeline/workflow-builder-dev.Dockerfile
+++ b/pipeline/workflow-builder-dev.Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/kiegroup/kogito-swf-builder-nightly:main-2024-02-16 AS builder
+FROM quay.io/kiegroup/kogito-swf-builder-nightly:main-2024-04-08 AS builder
 
 # Temp hack to provide persistence artifacts
 ENV MAVEN_REPO_URL=https://maven.repository.redhat.com/earlyaccess/all
diff --git a/pipeline/workflow-builder.Dockerfile b/pipeline/workflow-builder.Dockerfile
index f9504998..047f2a38 100644
--- a/pipeline/workflow-builder.Dockerfile
+++ b/pipeline/workflow-builder.Dockerfile
@@ -1,7 +1,9 @@
-FROM registry.redhat.io/openshift-serverless-1-tech-preview/logic-swf-builder-rhel8@sha256:d19b3ecaeac10e6aa03530008d25c8171254d561dc5519b9efd18dd4f0de5675 AS builder
+# FROM registry.redhat.io/openshift-serverless-1-tech-preview/logic-swf-builder-rhel8@sha256:d19b3ecaeac10e6aa03530008d25c8171254d561dc5519b9efd18dd4f0de5675 AS builder
+# Using the builder image below to address bugs https://issues.redhat.com/browse/FLPATH-1141 and https://issues.redhat.com/browse/FLPATH-1127
+FROM quay.io/kiegroup/kogito-swf-builder:9.99.1.CR1 AS builder
 
-# Temp hack to provide persistence artifacts
-ENV MAVEN_REPO_URL=https://maven.repository.redhat.com/earlyaccess/all
+# Temp hack to provide persistence artifacts - with quay.io/kiegroup/kogito-swf-builder:9.99.1.CR1 those dependencies are included in the base image.
+# ENV MAVEN_REPO_URL=https://maven.repository.redhat.com/earlyaccess/all
 
 # variables that can be overridden by the builder
 # To add a Quarkus extension to your application