diff --git a/image.yaml b/image.yaml
index 9c83742a7..7da54d146 100644
--- a/image.yaml
+++ b/image.yaml
@@ -1,7 +1,7 @@
 schema_version: 1
 
 name: "kogito-image-real-name-on-overrides-file"
-version: "1.39.0-snapshot"
+version: "1.39.0"
 from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 
 labels:
@@ -14,7 +14,7 @@ labels:
   - name: "io.quarkus.platform.version"
     value: "2.16.7.Final"
   - name: "org.kie.kogito.version"
-    value: "1.39.0-SNAPSHOT"
+    value: "1.39.0.Final"
 
 modules:
   repositories:
@@ -22,7 +22,7 @@ modules:
 
 envs:
   - name: "KOGITO_VERSION"
-    value: "1.39.0-SNAPSHOT"
+    value: "1.39.0.Final"
     description: Defines the Kogito version to be used by the builder images. Not intended to be changed by end user.
   - name: "QUARKUS_PLATFORM_VERSION"
     value: "2.16.7.Final"
diff --git a/kogito-imagestream.yaml b/kogito-imagestream.yaml
index f635ffc4e..99f48b9f1 100644
--- a/kogito-imagestream.yaml
+++ b/kogito-imagestream.yaml
@@ -15,18 +15,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '1.39.0-snapshot'
+        - name: '1.39.0'
           annotations:
             description: Runtime image for Kogito based on Quarkus native image
             iconClass: icon-jbpm
             tags: runtime,kogito,quarkus
             supports: quarkus
-            version: '1.39.0-snapshot'
+            version: '1.39.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-runtime-native:1.39.0-snapshot
+            name: quay.io/kiegroup/kogito-runtime-native:1.39.0
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -36,18 +36,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '1.39.0-snapshot'
+        - name: '1.39.0'
           annotations:
             description: Runtime image for Kogito based on Quarkus or Springboot JVM image
             iconClass: icon-jbpm
             tags: runtime,kogito,quarkus,springboot,jvm
             supports: quarkus
-            version: '1.39.0-snapshot'
+            version: '1.39.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-runtime-jvm:1.39.0-snapshot
+            name: quay.io/kiegroup/kogito-runtime-jvm:1.39.0
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -57,18 +57,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '1.39.0-snapshot'
+        - name: '1.39.0'
           annotations:
             description: Platform for building Kogito based on Quarkus or Springboot
             iconClass: icon-jbpm
             tags: s2i-builder,kogito,quarkus,springboot
             supports: quarkus
-            version: '1.39.0-snapshot'
+            version: '1.39.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-s2i-builder:1.39.0-snapshot
+            name: quay.io/kiegroup/kogito-s2i-builder:1.39.0
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -78,18 +78,18 @@ items:
         openshift.io/provider-display-name: KIE Group.
     spec:
       tags:
-        - name: '1.39.0-snapshot'
+        - name: '1.39.0'
           annotations:
             description: Kogito Serverless Workflow builder with minimum Quarkus extensions libraries preinstalled
             iconClass: icon-jbpm
             tags: kogito,quarkus,swf,maven
             supports: quarkus
-            version: '1.39.0-snapshot'
+            version: '1.39.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-swf-builder:1.39.0-snapshot
+            name: quay.io/kiegroup/kogito-swf-builder:1.39.0
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -99,18 +99,18 @@ items:
         openshift.io/provider-display-name: KIE Group.
     spec:
       tags:
-        - name: '1.39.0-snapshot'
+        - name: '1.39.0'
           annotations:
             description: Kogito base builder
             iconClass: icon-jbpm
             tags: kogito,jdk,maven
             supports: quarkus
-            version: '1.39.0-snapshot'
+            version: '1.39.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-base-builder:1.39.0-snapshot
+            name: quay.io/kiegroup/kogito-base-builder:1.39.0
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -120,18 +120,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '1.39.0-snapshot'
+        - name: '1.39.0'
           annotations:
             description: Runtime image for the Kogito Data Index Service with Infinispan
             iconClass: icon-jbpm
             tags: kogito,data-index,data-index-infinispan
             supports: persistence backed by Infinispan Server
-            version: '1.39.0-snapshot'
+            version: '1.39.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-data-index-infinispan:1.39.0-snapshot
+            name: quay.io/kiegroup/kogito-data-index-infinispan:1.39.0
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -141,18 +141,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '1.39.0-snapshot'
+        - name: '1.39.0'
           annotations:
             description: Runtime image for the Kogito Data Index Service with ephemeral PostgreSQL
             iconClass: icon-jbpm
             tags: kogito,data-index,data-index-ephemeral
             supports: persistence backed by ephemeral PostgreSQL Server
-            version: '1.39.0-snapshot'
+            version: '1.39.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-data-index-ephemeral:1.39.0-snapshot
+            name: quay.io/kiegroup/kogito-data-index-ephemeral:1.39.0
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -162,18 +162,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '1.39.0-snapshot'
+        - name: '1.39.0'
           annotations:
             description: Runtime image for the Kogito Data Index Service with Mongodb
             iconClass: icon-jbpm
             tags: kogito,data-index,data-index-mongodb
             supports: persistence backed by Mongodb server
-            version: '1.39.0-snapshot'
+            version: '1.39.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-data-index-mongodb:1.39.0-snapshot
+            name: quay.io/kiegroup/kogito-data-index-mongodb:1.39.0
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -183,18 +183,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '1.39.0-snapshot'
+        - name: '1.39.0'
           annotations:
             description: Runtime image for the Kogito Data Index Service with PostgreSQL
             iconClass: icon-jbpm
             tags: kogito,data-index,data-index-postgresql
             supports: persistence backed by PostgreSQL server
-            version: '1.39.0-snapshot'
+            version: '1.39.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-data-index-postgresql:1.39.0-snapshot
+            name: quay.io/kiegroup/kogito-data-index-postgresql:1.39.0
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -204,18 +204,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '1.39.0-snapshot'
+        - name: '1.39.0'
           annotations:
             description: Runtime image for the Kogito Trusty Service with Infinispan
             iconClass: icon-jbpm
             tags: kogito,trusty,trusty-infinispan
             supports: persistence backed by Infinispan server
-            version: '1.39.0-snapshot'
+            version: '1.39.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-trusty-infinispan:1.39.0-snapshot
+            name: quay.io/kiegroup/kogito-trusty-infinispan:1.39.0
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -225,18 +225,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '1.39.0-snapshot'
+        - name: '1.39.0'
           annotations:
             description: Runtime image for the Kogito Trusty Service with Redis
             iconClass: icon-jbpm
             tags: kogito,trusty,trusty-redis
             supports: persistence backed by Redis server
-            version: '1.39.0-snapshot'
+            version: '1.39.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-trusty-redis:1.39.0-snapshot
+            name: quay.io/kiegroup/kogito-trusty-redis:1.39.0
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -246,18 +246,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '1.39.0-snapshot'
+        - name: '1.39.0'
           annotations:
             description: Runtime image for the Kogito Trusty Service with PostgreSQL
             iconClass: icon-jbpm
             tags: kogito,trusty,trusty-postgresql
             supports: persistence backed by PostgreSQL RDBMS
-            version: '1.39.0-snapshot'
+            version: '1.39.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-trusty-postgresql:1.39.0-snapshot
+            name: quay.io/kiegroup/kogito-trusty-postgresql:1.39.0
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -267,18 +267,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '1.39.0-snapshot'
+        - name: '1.39.0'
           annotations:
             description: Runtime image for the Kogito Trusty UI Service
             iconClass: icon-jbpm
             tags: kogito,trusty-ui
             supports: Audit UI
-            version: '1.39.0-snapshot'
+            version: '1.39.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-trusty-ui:1.39.0-snapshot
+            name: quay.io/kiegroup/kogito-trusty-ui:1.39.0
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -288,18 +288,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '1.39.0-snapshot'
+        - name: '1.39.0'
           annotations:
             description: Runtime image for the Kogito JIT Runner
             iconClass: icon-jbpm
             tags: kogito,jit-runner
             supports: JIT Runner
-            version: '1.39.0-snapshot'
+            version: '1.39.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-jit-runner:1.39.0-snapshot
+            name: quay.io/kiegroup/kogito-jit-runner:1.39.0
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -309,18 +309,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '1.39.0-snapshot'
+        - name: '1.39.0'
           annotations:
             description: Runtime image for the Kogito Explainability Service
             iconClass: icon-jbpm
             tags: kogito,explainability
             supports: explainability for decisions
-            version: '1.39.0-snapshot'
+            version: '1.39.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-explainability:1.39.0-snapshot
+            name: quay.io/kiegroup/kogito-explainability:1.39.0
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -330,18 +330,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '1.39.0-snapshot'
+        - name: '1.39.0'
           annotations:
             description: Runtime image for Kogito in memory Jobs Service
             iconClass: icon-jbpm
             tags: kogito,jobs-service
             supports: out-of-box process timers
-            version: '1.39.0-snapshot'
+            version: '1.39.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-jobs-service-ephemeral:1.39.0-snapshot
+            name: quay.io/kiegroup/kogito-jobs-service-ephemeral:1.39.0
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -351,18 +351,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '1.39.0-snapshot'
+        - name: '1.39.0'
           annotations:
             description: Runtime image for Kogito Jobs Service based on Infinispan
             iconClass: icon-jbpm
             tags: kogito,jobs-service
             supports: out-of-box process timers
-            version: '1.39.0-snapshot'
+            version: '1.39.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-jobs-service-infinispan:1.39.0-snapshot
+            name: quay.io/kiegroup/kogito-jobs-service-infinispan:1.39.0
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -372,18 +372,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '1.39.0-snapshot'
+        - name: '1.39.0'
           annotations:
             description: Runtime image for Kogito Jobs Service based on Mongodb
             iconClass: icon-jbpm
             tags: kogito,jobs-service
             supports: out-of-box process timers
-            version: '1.39.0-snapshot'
+            version: '1.39.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-jobs-service-mongodb:1.39.0-snapshot
+            name: quay.io/kiegroup/kogito-jobs-service-mongodb:1.39.0
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -393,18 +393,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '1.39.0-snapshot'
+        - name: '1.39.0'
           annotations:
             description: Runtime image for Kogito Jobs Service based on Postgresql
             iconClass: icon-jbpm
             tags: kogito,jobs-service
             supports: out-of-box process timers
-            version: '1.39.0-snapshot'
+            version: '1.39.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-jobs-service-postgresql:1.39.0-snapshot
+            name: quay.io/kiegroup/kogito-jobs-service-postgresql:1.39.0
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -414,18 +414,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '1.39.0-snapshot'
+        - name: '1.39.0'
           annotations:
             description: All in One Runtime image for Kogito Jobs Service
             iconClass: icon-jbpm
             tags: kogito,jobs-service, all-in-one
             supports: out-of-box process timers
-            version: '1.39.0-snapshot'
+            version: '1.39.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-jobs-service-allinone:1.39.0-snapshot
+            name: quay.io/kiegroup/kogito-jobs-service-allinone:1.39.0
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -435,18 +435,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '1.39.0-snapshot'
+        - name: '1.39.0'
           annotations:
             description: Runtime image for the Kogito Management Console
             iconClass: icon-jbpm
             tags: kogito,management-console
             supports: business process management
-            version: '1.39.0-snapshot'
+            version: '1.39.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-management-console:1.39.0-snapshot
+            name: quay.io/kiegroup/kogito-management-console:1.39.0
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -456,15 +456,15 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '1.39.0-snapshot'
+        - name: '1.39.0'
           annotations:
             description: Runtime image for the Kogito Task Console
             iconClass: icon-jbpm
             tags: kogito,task-console
             supports: business process management
-            version: '1.39.0-snapshot'
+            version: '1.39.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-task-console:1.39.0-snapshot
+            name: quay.io/kiegroup/kogito-task-console:1.39.0
diff --git a/modules/kogito-custom-truststore/module.yaml b/modules/kogito-custom-truststore/module.yaml
index 468891b4d..c1f8988cb 100644
--- a/modules/kogito-custom-truststore/module.yaml
+++ b/modules/kogito-custom-truststore/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.security.custom.truststores
-version: "1.39.0-snapshot"
+version: "1.39.0"
 description: "Adds the capability of configuring a custom Java Truststore to replace the original cacerts"
 
 envs:
diff --git a/modules/kogito-data-index-common/module.yaml b/modules/kogito-data-index-common/module.yaml
index ad88b41c3..93304c6d6 100644
--- a/modules/kogito-data-index-common/module.yaml
+++ b/modules/kogito-data-index-common/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.dataindex.common
-version: "1.39.0-snapshot"
+version: "1.39.0"
 description: "Common modules for data-index persistence provider images, any addition that is common must be added in this module"
 
 envs:
diff --git a/modules/kogito-data-index-ephemeral/community/module.yaml b/modules/kogito-data-index-ephemeral/community/module.yaml
index 4c6e2a39a..137e4cafb 100644
--- a/modules/kogito-data-index-ephemeral/community/module.yaml
+++ b/modules/kogito-data-index-ephemeral/community/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.dataindex.community.ephemeral
-version: "1.39.0-snapshot"
+version: "1.39.0"
 
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 9d82afad2..2338774af 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.dataindex.infinispan
-version: "1.39.0-snapshot"
+version: "1.39.0"
 
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 81b4c1e78..1cf4655cb 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.dataindex.mongodb
-version: "1.39.0-snapshot"
+version: "1.39.0"
 
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
diff --git a/modules/kogito-data-index-oracle/module.yaml b/modules/kogito-data-index-oracle/module.yaml
index 1a6a23730..ea8637df7 100644
--- a/modules/kogito-data-index-oracle/module.yaml
+++ b/modules/kogito-data-index-oracle/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.dataindex.oracle
-version: "1.39.0-snapshot"
+version: "1.39.0"
 
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 22f8c50ea..6c5445d05 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.dataindex.postgresql
-version: "1.39.0-snapshot"
+version: "1.39.0"
 
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
diff --git a/modules/kogito-dynamic-resources/module.yaml b/modules/kogito-dynamic-resources/module.yaml
index a0bd42278..d5e6530df 100644
--- a/modules/kogito-dynamic-resources/module.yaml
+++ b/modules/kogito-dynamic-resources/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.dynamic.resources
-version: "1.39.0-snapshot"
+version: "1.39.0"
 
 description: -| Module retrieved from https://github.com/jboss-openshift/cct_module/blob/master/jboss/container/java/jvm/bash However it contains a few customizations to fit Kogito needs.
 
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index ded7bfa8c..1dbc1eae7 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.explainability
-version: "1.39.0-snapshot"
+version: "1.39.0"
 
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
diff --git a/modules/kogito-graalvm-scripts/module.yaml b/modules/kogito-graalvm-scripts/module.yaml
index cc3637981..6e3ac834d 100644
--- a/modules/kogito-graalvm-scripts/module.yaml
+++ b/modules/kogito-graalvm-scripts/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.graalvm.scripts
-version: "1.39.0-snapshot"
+version: "1.39.0"
 
 execute:
   - script: configure
diff --git a/modules/kogito-image-dependencies/module.yaml b/modules/kogito-image-dependencies/module.yaml
index 5214d0b1b..2d9c1d021 100644
--- a/modules/kogito-image-dependencies/module.yaml
+++ b/modules/kogito-image-dependencies/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.image.dependencies
-version: "1.39.0-snapshot"
+version: "1.39.0"
 description: holds common dependencies across images
 
 execute:
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 54fd54968..e89f19b00 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.jit-runner
-version: "1.39.0-snapshot"
+version: "1.39.0"
 
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
diff --git a/modules/kogito-jobs-service-all-in-one/module.yaml b/modules/kogito-jobs-service-all-in-one/module.yaml
index f0803b0aa..ed3db9dbd 100644
--- a/modules/kogito-jobs-service-all-in-one/module.yaml
+++ b/modules/kogito-jobs-service-all-in-one/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.jobs.service.allinone
-version: "1.39.0-snapshot"
+version: "1.39.0"
 
 artifacts:
   - path: /tmp/build/jobs-service-inmemory-all-in-one/jobs-service-inmemory-quarkus-app.zip
diff --git a/modules/kogito-jobs-service-common/module.yaml b/modules/kogito-jobs-service-common/module.yaml
index dc1a3883a..804b103ac 100644
--- a/modules/kogito-jobs-service-common/module.yaml
+++ b/modules/kogito-jobs-service-common/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.jobs.service.common
-version: "1.39.0-snapshot"
+version: "1.39.0"
 description: "This module needs to be run last, if adding it, add in the last position."
 
 execute:
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index b21768194..eefef3818 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.jobs.service.ephemeral
-version: "1.39.0-snapshot"
+version: "1.39.0"
 
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index a271ede3a..7894128ba 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.jobs.service.infinispan
-version: "1.39.0-snapshot"
+version: "1.39.0"
 
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 210c73552..76635947e 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.jobs.service.mongodb
-version: "1.39.0-snapshot"
+version: "1.39.0"
 
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index fe62f6b02..e6d41c278 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.jobs.service.postgresql
-version: "1.39.0-snapshot"
+version: "1.39.0"
 
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
diff --git a/modules/kogito-kubernetes-client/module.yaml b/modules/kogito-kubernetes-client/module.yaml
index 12511cf62..cdadbe274 100644
--- a/modules/kogito-kubernetes-client/module.yaml
+++ b/modules/kogito-kubernetes-client/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.kubernetes.client
-version: "1.39.0-snapshot"
+version: "1.39.0"
 
 execute:
   - script: configure
diff --git a/modules/kogito-launch-scripts/module.yaml b/modules/kogito-launch-scripts/module.yaml
index 9c62d7d3d..44107f177 100644
--- a/modules/kogito-launch-scripts/module.yaml
+++ b/modules/kogito-launch-scripts/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.launch.scripts
-version: "1.39.0-snapshot"
+version: "1.39.0"
 
 execute:
   - script: configure
diff --git a/modules/kogito-logging/module.yaml b/modules/kogito-logging/module.yaml
index bf2a4e198..2bdb5edaf 100644
--- a/modules/kogito-logging/module.yaml
+++ b/modules/kogito-logging/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.logging
-version: "1.39.0-snapshot"
+version: "1.39.0"
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 896c5ff76..5790974ff 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.management.console
-version: "1.39.0-snapshot"
+version: "1.39.0"
 
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
diff --git a/modules/kogito-persistence/module.yaml b/modules/kogito-persistence/module.yaml
index 663346b13..5fec940a2 100644
--- a/modules/kogito-persistence/module.yaml
+++ b/modules/kogito-persistence/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.persistence
-version: "1.39.0-snapshot"
+version: "1.39.0"
 
 modules:
   install:
diff --git a/modules/kogito-pkg-update/module.yaml b/modules/kogito-pkg-update/module.yaml
index 7d54ae7a8..ff03ec80f 100644
--- a/modules/kogito-pkg-update/module.yaml
+++ b/modules/kogito-pkg-update/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.pkg-update
-version: "1.39.0-snapshot"
+version: "1.39.0"
 description: "Perform a system update via the package manager."
 
 execute:
diff --git a/modules/kogito-runtime-jvm/module.yaml b/modules/kogito-runtime-jvm/module.yaml
index c5aeddb0a..748a5faf9 100644
--- a/modules/kogito-runtime-jvm/module.yaml
+++ b/modules/kogito-runtime-jvm/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.runtime.jvm
-version: "1.39.0-snapshot"
+version: "1.39.0"
 
 execute:
   - script: configure
diff --git a/modules/kogito-runtime-native/module.yaml b/modules/kogito-runtime-native/module.yaml
index 2807223a2..543a5c758 100644
--- a/modules/kogito-runtime-native/module.yaml
+++ b/modules/kogito-runtime-native/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.runtime.native
-version: "1.39.0-snapshot"
+version: "1.39.0"
 
 execute:
   - script: configure
diff --git a/modules/kogito-s2i-builder/module.yaml b/modules/kogito-s2i-builder/module.yaml
index 1dc840c6c..230fa5c33 100644
--- a/modules/kogito-s2i-builder/module.yaml
+++ b/modules/kogito-s2i-builder/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.s2i.builder
-version: "1.39.0-snapshot"
+version: "1.39.0"
 
 labels:
   - name: "io.openshift.s2i.scripts-url"
diff --git a/modules/kogito-s2i-core/module.yaml b/modules/kogito-s2i-core/module.yaml
index d6b0ab9ba..1bac2a3d5 100644
--- a/modules/kogito-s2i-core/module.yaml
+++ b/modules/kogito-s2i-core/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.s2i.core
-version: '1.39.0-snapshot'
+version: '1.39.0'
 description: Kogito s2i core module. All s2i files shoul be placed here.
 
 labels:
diff --git a/modules/kogito-swf/builder/module.yaml b/modules/kogito-swf/builder/module.yaml
index 302e21ef0..628885ca7 100644
--- a/modules/kogito-swf/builder/module.yaml
+++ b/modules/kogito-swf/builder/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.swf.builder
-version: "1.39.0-snapshot"
+version: "1.39.0"
 description: "Kogito Serverless Workflow builder with required extensions"
 
 envs:
diff --git a/modules/kogito-swf/common/module.yaml b/modules/kogito-swf/common/module.yaml
index 18b6d803b..50fde326b 100644
--- a/modules/kogito-swf/common/module.yaml
+++ b/modules/kogito-swf/common/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.swf.common
-version: "1.39.0-snapshot"
+version: "1.39.0"
 description: "Kogito Serverless Workflow image common scripts"
 
 envs:
diff --git a/modules/kogito-swf/devmode/module.yaml b/modules/kogito-swf/devmode/module.yaml
index 1ca4268c9..8c3c5998c 100644
--- a/modules/kogito-swf/devmode/module.yaml
+++ b/modules/kogito-swf/devmode/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.swf.devmode
-version: "1.39.0-snapshot"
+version: "1.39.0"
 description: "Kogito Serverless Workflow builder with required extensions"
 
 envs:
diff --git a/modules/kogito-system-user/module.yaml b/modules/kogito-system-user/module.yaml
index 8122c50ad..704c2b5ff 100644
--- a/modules/kogito-system-user/module.yaml
+++ b/modules/kogito-system-user/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.system.user
-version: "1.39.0-snapshot"
+version: "1.39.0"
 
 execute:
   - script: add-user
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 995d72c20..d79047328 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.task.console
-version: "1.39.0-snapshot"
+version: "1.39.0"
 
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
diff --git a/modules/kogito-trusty-common/module.yaml b/modules/kogito-trusty-common/module.yaml
index fffaa0883..37094bd20 100644
--- a/modules/kogito-trusty-common/module.yaml
+++ b/modules/kogito-trusty-common/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.trusty.common
-version: "1.39.0-snapshot"
+version: "1.39.0"
 description: "Common modules for trusty provider images, any addition that is common must be added in this module"
 
 execute:
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 70d16bc91..b4ab81120 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.trusty.infinispan
-version: "1.39.0-snapshot"
+version: "1.39.0"
 
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
index 2fa6ae26b..b41c2f06a 100644
--- a/modules/kogito-trusty-postgresql/module.yaml
+++ b/modules/kogito-trusty-postgresql/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.trusty.postgresql
-version: "1.39.0-snapshot"
+version: "1.39.0"
 
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 31b66f1c2..6cee28c8d 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.trusty.redis
-version: "1.39.0-snapshot"
+version: "1.39.0"
 
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index f64a0c1e6..a58a70e24 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.trusty.ui
-version: "1.39.0-snapshot"
+version: "1.39.0"
 
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
diff --git a/tests/features/kogito-common-builder-jvm.feature b/tests/features/kogito-common-builder-jvm.feature
index b9eda9d00..bcfc2992d 100644
--- a/tests/features/kogito-common-builder-jvm.feature
+++ b/tests/features/kogito-common-builder-jvm.feature
@@ -8,7 +8,7 @@ Feature: kogito-s2i-builder image JVM build tests
     And run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-11
 
   Scenario: Verify if the s2i build is finished as expected with non native build and no runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-1.39.x
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using 1.39.x
       | variable     | value   |
       | NATIVE       | false   |
       | RUNTIME_TYPE | quarkus |
@@ -26,7 +26,7 @@ Feature: kogito-s2i-builder image JVM build tests
     And file /home/kogito/cacerts should exist
 
   Scenario: Verify if the s2i build is finished as expected with non native build and no runtime image and no RUNTIME_TYPE defined
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-1.39.x
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using 1.39.x
       | variable     | value   |
       | NATIVE       | false   |
     Then check that page is served
@@ -43,7 +43,7 @@ Feature: kogito-s2i-builder image JVM build tests
     And file /home/kogito/cacerts should exist
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build with runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-1.39.x and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using 1.39.x and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable     | value                     |
       | NATIVE       | false                     |
       | RUNTIME_TYPE | quarkus                   |
@@ -62,7 +62,7 @@ Feature: kogito-s2i-builder image JVM build tests
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Dquarkus.log.level=DEBUG
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build and if it is listening on the expected port , test uses custom properties file to test the port configuration.
-    Given s2i build /tmp/kogito-examples from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-1.39.x and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build /tmp/kogito-examples from kogito-quarkus-examples/rules-quarkus-helloworld using 1.39.x and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable     | value   |
       | RUNTIME_TYPE | quarkus |
       | NATIVE       | false   |
@@ -78,7 +78,7 @@ Feature: kogito-s2i-builder image JVM build tests
     And file /home/kogito/bin/quarkus-run.jar should exist
 
   Scenario: Verify if the multi-module s2i build is finished as expected performing a non native build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using nightly-1.39.x and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using 1.39.x and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable          | value                                                    |
       | RUNTIME_TYPE      | quarkus                                                  |
       | NATIVE            | false                                                    |
@@ -96,7 +96,7 @@ Feature: kogito-s2i-builder image JVM build tests
     And file /home/kogito/bin/quarkus-run.jar should exist
 
   Scenario: Perform a incremental s2i build using quarkus runtime type
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using nightly-1.39.x
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using 1.39.x
       | variable     | value   |
       | RUNTIME_TYPE | quarkus |
       | NATIVE       | false   |
@@ -114,7 +114,7 @@ Feature: kogito-s2i-builder image JVM build tests
 
   # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
   Scenario: Perform a second incremental s2i build using quarkus runtime type
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using nightly-1.39.x
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using 1.39.x
       | variable     | value   |
       | RUNTIME_TYPE | quarkus |
       | NATIVE       | false   |
@@ -135,7 +135,7 @@ Feature: kogito-s2i-builder image JVM build tests
 #### SpringBoot Scenarios
 
   Scenario: Verify if the s2i build is finished as expected with debug enabled
-      Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-springboot-examples/process-springboot-example using nightly-1.39.x and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+      Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-springboot-examples/process-springboot-example using 1.39.x and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
         | variable     | value        |
         | RUNTIME_TYPE | springboot   |
         | JAVA_OPTIONS | -Ddebug=true |
@@ -153,7 +153,7 @@ Feature: kogito-s2i-builder image JVM build tests
       And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
   
   Scenario: Verify if the s2i build is finished as expected with no runtime image and debug enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-springboot-examples/process-springboot-example using nightly-1.39.x
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-springboot-examples/process-springboot-example using 1.39.x
       | variable            | value        |
       | JAVA_OPTIONS        | -Ddebug=true |
       | RUNTIME_TYPE        | springboot   |
@@ -171,7 +171,7 @@ Feature: kogito-s2i-builder image JVM build tests
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
   
   Scenario: Verify if the s2i build is finished as expected and if it is listening on the expected port, test uses custom properties file to test the port configuration.
-    Given s2i build /tmp/kogito-examples from kogito-springboot-examples/process-springboot-example using nightly-1.39.x and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build /tmp/kogito-examples from kogito-springboot-examples/process-springboot-example using 1.39.x and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
       | variable     | value      |
       | RUNTIME_TYPE | springboot |
@@ -188,7 +188,7 @@ Feature: kogito-s2i-builder image JVM build tests
     And container log should contain Tomcat initialized with port(s): 8080 (http)
   
   Scenario: Verify if the s2i build is finished as expected using multi-module build with debug enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using nightly-1.39.x and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using 1.39.x and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable          | value |
       | JAVA_OPTIONS      | -Ddebug=true                       |
       | RUNTIME_TYPE      | springboot                         |
@@ -208,7 +208,7 @@ Feature: kogito-s2i-builder image JVM build tests
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
 
   Scenario: Perform a incremental s2i build using springboot runtime type
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-springboot-examples/process-springboot-example with env and incremental using nightly-1.39.x
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-springboot-examples/process-springboot-example with env and incremental using 1.39.x
       # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
       | variable     | value      |
       | RUNTIME_TYPE | springboot |
@@ -225,7 +225,7 @@ Feature: kogito-s2i-builder image JVM build tests
 
   # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
   Scenario: Perform a second incremental s2i build using springboot runtime type
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-springboot-examples/process-springboot-example with env and incremental using nightly-1.39.x
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-springboot-examples/process-springboot-example with env and incremental using 1.39.x
       # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
       | variable     | value      |
       | RUNTIME_TYPE | springboot |
@@ -233,7 +233,7 @@ Feature: kogito-s2i-builder image JVM build tests
     And s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
 
   Scenario: Verify if the s2i build is finished as expected with uber-jar package type built
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/process-quarkus-example using nightly-1.39.x and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/process-quarkus-example using 1.39.x and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable          | value                           |
       | MAVEN_ARGS_APPEND | -Dquarkus.package.type=uber-jar |
       | RUNTIME_TYPE      | quarkus                         |
diff --git a/tests/features/kogito-s2i-builder-native.feature b/tests/features/kogito-s2i-builder-native.feature
index 1001ff0c3..f71d91f5c 100644
--- a/tests/features/kogito-s2i-builder-native.feature
+++ b/tests/features/kogito-s2i-builder-native.feature
@@ -15,7 +15,7 @@ Feature: kogito-s2i-builder image native build tests
     And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 22.3.0
 
   Scenario: Verify if the s2i build is finished as expected using native build and runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-1.39.x and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using 1.39.x and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
       | variable     | value      |
       | NATIVE       | true       |
       | RUNTIME_TYPE | quarkus    |
@@ -33,7 +33,7 @@ Feature: kogito-s2i-builder image native build tests
     And s2i build log should contain -J-Xmx2576980378
 
   Scenario: Verify if the s2i build is finished as expected using native build and no runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-1.39.x
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using 1.39.x
       | variable | value          |
       | NATIVE       | true       |
       | RUNTIME_TYPE | quarkus    |
@@ -53,7 +53,7 @@ Feature: kogito-s2i-builder image native build tests
     And s2i build log should contain -J-Xmx2576980378
 
   Scenario: Verify if the s2i build is finished as expected performing a native build and if it is listening on the expected port, test uses custom properties file to test the port configuration.
-    Given s2i build /tmp/kogito-examples from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-1.39.x and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
+    Given s2i build /tmp/kogito-examples from kogito-quarkus-examples/rules-quarkus-helloworld using 1.39.x and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
       | variable     | value      |
       | NATIVE       | true       |
       | RUNTIME_TYPE | quarkus    |
@@ -71,7 +71,7 @@ Feature: kogito-s2i-builder image native build tests
     And s2i build log should contain -J-Xmx5153960755
 
   Scenario: Verify if the s2i build is finished as expected performing a native build with persistence enabled - Step 1: build the application and copy to the runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/process-quarkus-example using nightly-1.39.x and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/process-quarkus-example using 1.39.x and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
       | variable          | value         |
       | RUNTIME_TYPE      | quarkus       |
       | NATIVE            | true          |
@@ -84,7 +84,7 @@ Feature: kogito-s2i-builder image native build tests
      And s2i build log should contain -J-Xmx5153960755
 
   Scenario: Perform a incremental s2i build for native test
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using nightly-1.39.x
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using 1.39.x
       | variable     | value   |
       | RUNTIME_TYPE | quarkus |
       | NATIVE       | false   |
@@ -102,7 +102,7 @@ Feature: kogito-s2i-builder image native build tests
 
   # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
   Scenario:Perform a second incremental s2i build for native scenario, this time, with native enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using nightly-1.39.x
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using 1.39.x
       | variable     | value      |
       | RUNTIME_TYPE | quarkus    |
       | NATIVE       | true       |
@@ -122,12 +122,12 @@ Feature: kogito-s2i-builder image native build tests
     And s2i build log should contain -J-Xmx5153960755
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly using native build
-    Given s2i build /tmp/kogito-examples from dmn-example using nightly-1.39.x and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
+    Given s2i build /tmp/kogito-examples from dmn-example using 1.39.x and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | true           |
       | LIMIT_MEMORY   | 6442450944     |
-      | KOGITO_VERSION | 1.39.0-SNAPSHOT |             
+      | KOGITO_VERSION | 1.39.0.Final |              
     Then file /home/kogito/bin/project-1.0-SNAPSHOT-runner should exist
     And check that page is served
       | property        | value                                                                                            |
diff --git a/tests/features/kogito-s2i-builder.feature b/tests/features/kogito-s2i-builder.feature
index e02718392..d0eed41ed 100644
--- a/tests/features/kogito-s2i-builder.feature
+++ b/tests/features/kogito-s2i-builder.feature
@@ -23,7 +23,7 @@ Feature: kogito-s2i-builder image tests
     And file /home/kogito/.m2/settings.xml should not contain <url>https://maven.repository.redhat.com/techpreview/all</url>
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build with persistence enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/process-quarkus-example using nightly-1.39.x and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/process-quarkus-example using 1.39.x and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable          | value         |
       | NATIVE            | false         |
       | RUNTIME_TYPE      | quarkus       |
@@ -33,7 +33,7 @@ Feature: kogito-s2i-builder image tests
     And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
 
   Scenario: Verify if the s2i build is finished as expected with persistence enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-springboot-examples/process-springboot-example using nightly-1.39.x and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-springboot-examples/process-springboot-example using 1.39.x and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable          | value         |
       | MAVEN_ARGS_APPEND | -Ppersistence |
       | RUNTIME_TYPE      | springboot    |
@@ -42,11 +42,11 @@ Feature: kogito-s2i-builder image tests
     And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly
-    Given s2i build /tmp/kogito-examples from dmn-example using nightly-1.39.x and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build /tmp/kogito-examples from dmn-example using 1.39.x and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
-      | KOGITO_VERSION | 1.39.0-SNAPSHOT |           
+      | KOGITO_VERSION | 1.39.0.Final |            
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
     And s2i build log should contain Using Quarkus io.quarkus.platform:quarkus-maven-plugin:
@@ -70,11 +70,11 @@ Feature: kogito-s2i-builder image tests
 
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly with custom group id, archetype & version
-    Given s2i build /tmp/kogito-examples from dmn-example using nightly-1.39.x and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build /tmp/kogito-examples from dmn-example using 1.39.x and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
-      | KOGITO_VERSION | 1.39.0-SNAPSHOT |           
+      | KOGITO_VERSION | 1.39.0.Final |            
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
@@ -91,11 +91,11 @@ Feature: kogito-s2i-builder image tests
       | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
 
   Scenario: Verify that the Kogito Quarkus Serverless Workflow Extension is building the service properly
-    Given s2i build /tmp/kogito-examples from serverless-workflow-examples/serverless-workflow-order-processing/src/main/resources using nightly-1.39.x and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build /tmp/kogito-examples from serverless-workflow-examples/serverless-workflow-order-processing/src/main/resources using 1.39.x and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable                 | value                                                 |
       | RUNTIME_TYPE             | quarkus                                               |
       | NATIVE                   | false                                                 |
-      | KOGITO_VERSION | 1.39.0-SNAPSHOT |           
+      | KOGITO_VERSION | 1.39.0.Final |            
       | PROJECT_GROUP_ID         | com.mycompany                                         |
       | PROJECT_ARTIFACT_ID      | myproject                                             |
       | PROJECT_VERSION          | 2.0-SNAPSHOT                                          |
@@ -117,9 +117,9 @@ Feature: kogito-s2i-builder image tests
 #### SpringBoot Scenarios
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
-    Given s2i build /tmp/kogito-examples from dmn-example using nightly-1.39.x and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build /tmp/kogito-examples from dmn-example using 1.39.x and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable       | value          |
-      | KOGITO_VERSION | 1.39.0-SNAPSHOT |           
+      | KOGITO_VERSION | 1.39.0.Final |            
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
     And s2i build log should contain Generating springboot project structure for project...
diff --git a/tests/features/rhpam-kogito-builder-jvm.feature b/tests/features/rhpam-kogito-builder-jvm.feature
index e62ff3500..9eb5c8958 100644
--- a/tests/features/rhpam-kogito-builder-jvm.feature
+++ b/tests/features/rhpam-kogito-builder-jvm.feature
@@ -25,19 +25,19 @@ Feature: rhpam-kogito-builder-rhel8 feature.
     And file /home/kogito/.m2/settings.xml should contain <url>https://maven.repository.redhat.com/techpreview/all</url>
 
   Scenario: Check if the expected message is printed if native build is enabled
-    Given s2i build /tmp/kogito-examples from dmn-example using nightly-1.39.x and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
+    Given s2i build /tmp/kogito-examples from dmn-example using 1.39.x and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | true           |
-      | KOGITO_VERSION | 1.39.0-SNAPSHOT |   
+      | KOGITO_VERSION | 1.39.0.Final |    
     Then s2i build log should contain Container Image rhpam-7/rhpam-kogito-builder-rhel8 does not supports native builds, please refer to the documentation.
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly
-    Given s2i build /tmp/kogito-examples from dmn-example using nightly-1.39.x and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
+    Given s2i build /tmp/kogito-examples from dmn-example using 1.39.x and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
-      | KOGITO_VERSION | 1.39.0-SNAPSHOT |           
+      | KOGITO_VERSION | 1.39.0.Final |            
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
     And s2i build log should contain Using Quarkus com.redhat.quarkus.platform:quarkus-maven-plugin
@@ -60,11 +60,11 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | request_body    | {"status": "UP", "checks": []}  |
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly with custom group id, archetype & version
-    Given s2i build /tmp/kogito-examples from dmn-example using nightly-1.39.x and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
+    Given s2i build /tmp/kogito-examples from dmn-example using 1.39.x and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
-      | KOGITO_VERSION | 1.39.0-SNAPSHOT |   
+      | KOGITO_VERSION | 1.39.0.Final |    
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
@@ -83,9 +83,9 @@ Feature: rhpam-kogito-builder-rhel8 feature.
 #### SpringBoot Scenarios
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
-    Given s2i build /tmp/kogito-examples from dmn-example using nightly-1.39.x and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
+    Given s2i build /tmp/kogito-examples from dmn-example using 1.39.x and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
       | variable       | value          |
-      | KOGITO_VERSION | 1.39.0-SNAPSHOT |           
+      | KOGITO_VERSION | 1.39.0.Final |            
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
     And s2i build log should contain Generating springboot project structure for project...
diff --git a/tests/test-apps/clone-repo.sh b/tests/test-apps/clone-repo.sh
index 9eefae0d3..cf2a46c72 100755
--- a/tests/test-apps/clone-repo.sh
+++ b/tests/test-apps/clone-repo.sh
@@ -41,7 +41,7 @@ git clone https://github.com/kiegroup/kogito-examples.git
 cd kogito-examples/
 git fetch origin
 git fetch origin --tags
-git checkout -b nightly-1.39.x
+git checkout -b 1.39.x
 
 # make a new copy of rules-quarkus-helloworld for native tests
 cp -rv  /tmp/kogito-examples/kogito-quarkus-examples/rules-quarkus-helloworld/ /tmp/kogito-examples/kogito-quarkus-examples/rules-quarkus-helloworld-native/