diff --git a/kogito-base-builder-image.yaml b/kogito-base-builder-image.yaml
index fa6e8a742..a15fd27e5 100644
--- a/kogito-base-builder-image.yaml
+++ b/kogito-base-builder-image.yaml
@@ -19,7 +19,7 @@
 schema_version: 1
 
 name: "docker.io/apache/incubator-kie-kogito-base-builder"
-version: "10.0.999-snapshot"
+version: "10.0.999-SNAPSHOT"
 from: "registry.access.redhat.com/ubi8/openjdk-17:1.19"
 description: "Image with JDK and Maven, used as a base image. It is used by Web Tools !"
 
diff --git a/kogito-data-index-ephemeral-image.yaml b/kogito-data-index-ephemeral-image.yaml
index 914f45b5c..eb76b93e5 100644
--- a/kogito-data-index-ephemeral-image.yaml
+++ b/kogito-data-index-ephemeral-image.yaml
@@ -19,7 +19,7 @@
 schema_version: 1
 
 name: "docker.io/apache/incubator-kie-kogito-data-index-ephemeral"
-version: "10.0.999-snapshot"
+version: "10.0.999-SNAPSHOT"
 from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19"
 description: "Runtime image for Kogito Data Index Service for ephemeral PostgreSQL persistence provider"
 
diff --git a/kogito-data-index-postgresql-image.yaml b/kogito-data-index-postgresql-image.yaml
index 5d5650f8b..96d66211e 100644
--- a/kogito-data-index-postgresql-image.yaml
+++ b/kogito-data-index-postgresql-image.yaml
@@ -19,7 +19,7 @@
 schema_version: 1
 
 name: "docker.io/apache/incubator-kie-kogito-data-index-postgresql"
-version: "10.0.999-snapshot"
+version: "10.0.999-SNAPSHOT"
 from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19"
 description: "Runtime image for Kogito Data Index Service for PostgreSQL persistence provider"
 
diff --git a/kogito-imagestream.yaml b/kogito-imagestream.yaml
index c5fed409e..2af6a9fd3 100644
--- a/kogito-imagestream.yaml
+++ b/kogito-imagestream.yaml
@@ -33,18 +33,18 @@ items:
         openshift.io/provider-display-name: KIE Group.
     spec:
       tags:
-        - name: '10.0.999-snapshot'
+        - name: '10.0.999-SNAPSHOT'
           annotations:
             description: Kogito Serverless Workflow builder with minimum Quarkus extensions libraries preinstalled
             iconClass: icon-jbpm
             tags: kogito,quarkus,swf,maven
             supports: quarkus
-            version: '10.0.999-snapshot'
+            version: '10.0.999-SNAPSHOT'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: docker.io/apache/incubator-kie-sonataflow-builder:10.0.999-snapshot
+            name: docker.io/apache/incubator-kie-sonataflow-builder:10.0.999-SNAPSHOT
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -54,18 +54,18 @@ items:
         openshift.io/provider-display-name: KIE Group.
     spec:
       tags:
-        - name: '10.0.999-snapshot'
+        - name: '10.0.999-SNAPSHOT'
           annotations:
             description: Kogito base builder
             iconClass: icon-jbpm
             tags: kogito,jdk,maven
             supports: quarkus
-            version: '10.0.999-snapshot'
+            version: '10.0.999-SNAPSHOT'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: docker.io/apache/incubator-kie-kogito-base-builder:10.0.999-snapshot
+            name: docker.io/apache/incubator-kie-kogito-base-builder:10.0.999-SNAPSHOT
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -75,18 +75,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '10.0.999-snapshot'
+        - name: '10.0.999-SNAPSHOT'
           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: '10.0.999-snapshot'
+            version: '10.0.999-SNAPSHOT'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: docker.io/apache/incubator-kie-kogito-data-index-ephemeral:10.0.999-snapshot
+            name: docker.io/apache/incubator-kie-kogito-data-index-ephemeral:10.0.999-SNAPSHOT
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -96,18 +96,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '10.0.999-snapshot'
+        - name: '10.0.999-SNAPSHOT'
           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: '10.0.999-snapshot'
+            version: '10.0.999-SNAPSHOT'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: docker.io/apache/incubator-kie-kogito-data-index-postgresql:10.0.999-snapshot
+            name: docker.io/apache/incubator-kie-kogito-data-index-postgresql:10.0.999-SNAPSHOT
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -117,18 +117,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '10.0.999-snapshot'
+        - name: '10.0.999-SNAPSHOT'
           annotations:
             description: Runtime image for the Kogito JIT Runner
             iconClass: icon-jbpm
             tags: kogito,jit-runner
             supports: JIT Runner
-            version: '10.0.999-snapshot'
+            version: '10.0.999-SNAPSHOT'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: docker.io/apache/incubator-kie-kogito-jit-runner:10.0.999-snapshot
+            name: docker.io/apache/incubator-kie-kogito-jit-runner:10.0.999-SNAPSHOT
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -138,18 +138,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '10.0.999-snapshot'
+        - name: '10.0.999-SNAPSHOT'
           annotations:
             description: Runtime image for Kogito in memory Jobs Service
             iconClass: icon-jbpm
             tags: kogito,jobs-service
             supports: out-of-box process timers
-            version: '10.0.999-snapshot'
+            version: '10.0.999-SNAPSHOT'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: docker.io/apache/incubator-kie-kogito-jobs-service-ephemeral:10.0.999-snapshot
+            name: docker.io/apache/incubator-kie-kogito-jobs-service-ephemeral:10.0.999-SNAPSHOT
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -159,18 +159,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '10.0.999-snapshot'
+        - name: '10.0.999-SNAPSHOT'
           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: '10.0.999-snapshot'
+            version: '10.0.999-SNAPSHOT'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: docker.io/apache/incubator-kie-kogito-jobs-service-postgresql:10.0.999-snapshot
+            name: docker.io/apache/incubator-kie-kogito-jobs-service-postgresql:10.0.999-SNAPSHOT
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -180,15 +180,15 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '10.0.999-snapshot'
+        - name: '10.0.999-SNAPSHOT'
           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: '10.0.999-snapshot'
+            version: '10.0.999-SNAPSHOT'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: docker.io/apache/incubator-kie-kogito-jobs-service-allinone:10.0.999-snapshot
+            name: docker.io/apache/incubator-kie-kogito-jobs-service-allinone:10.0.999-SNAPSHOT
diff --git a/kogito-jit-runner-image.yaml b/kogito-jit-runner-image.yaml
index 76655f295..1c097e55b 100644
--- a/kogito-jit-runner-image.yaml
+++ b/kogito-jit-runner-image.yaml
@@ -19,7 +19,7 @@
 schema_version: 1
 
 name: "docker.io/apache/incubator-kie-kogito-jit-runner"
-version: "10.0.999-snapshot"
+version: "10.0.999-SNAPSHOT"
 from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19"
 description: "Runtime image for Kogito JIT Runner"
 
diff --git a/kogito-jobs-service-allinone-image.yaml b/kogito-jobs-service-allinone-image.yaml
index dc100de38..6341fa25e 100644
--- a/kogito-jobs-service-allinone-image.yaml
+++ b/kogito-jobs-service-allinone-image.yaml
@@ -19,7 +19,7 @@
 schema_version: 1
 
 name: "docker.io/apache/incubator-kie-kogito-jobs-service-allinone"
-version: "10.0.999-snapshot"
+version: "10.0.999-SNAPSHOT"
 from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19"
 description: "Runtime image for Kogito Jobs Service with all available jdbc providers"
 
diff --git a/kogito-jobs-service-ephemeral-image.yaml b/kogito-jobs-service-ephemeral-image.yaml
index 7eaa3968e..bde5add44 100644
--- a/kogito-jobs-service-ephemeral-image.yaml
+++ b/kogito-jobs-service-ephemeral-image.yaml
@@ -19,7 +19,7 @@
 schema_version: 1
 
 name: "docker.io/apache/incubator-kie-kogito-jobs-service-ephemeral"
-version: "10.0.999-snapshot"
+version: "10.0.999-SNAPSHOT"
 from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19"
 description: "Runtime image for Kogito in memory Jobs Service"
 
diff --git a/kogito-jobs-service-postgresql-image.yaml b/kogito-jobs-service-postgresql-image.yaml
index 306bf41d6..f83f758e1 100644
--- a/kogito-jobs-service-postgresql-image.yaml
+++ b/kogito-jobs-service-postgresql-image.yaml
@@ -19,7 +19,7 @@
 schema_version: 1
 
 name: "docker.io/apache/incubator-kie-kogito-jobs-service-postgresql"
-version: "10.0.999-snapshot"
+version: "10.0.999-SNAPSHOT"
 from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19"
 description: "Runtime image for Kogito Jobs Service based on Postgresql"
 
diff --git a/modules/kogito-custom-truststore/module.yaml b/modules/kogito-custom-truststore/module.yaml
index e3fa621d0..d54b0982d 100644
--- a/modules/kogito-custom-truststore/module.yaml
+++ b/modules/kogito-custom-truststore/module.yaml
@@ -18,7 +18,7 @@
 #
 schema_version: 1
 name: org.kie.kogito.security.custom.truststores
-version: "10.0.999-snapshot"
+version: "10.0.999-SNAPSHOT"
 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 305b6a7e1..1f5d1a3d1 100644
--- a/modules/kogito-data-index-common/module.yaml
+++ b/modules/kogito-data-index-common/module.yaml
@@ -18,7 +18,7 @@
 #
 schema_version: 1
 name: org.kie.kogito.dataindex.common
-version: "10.0.999-snapshot"
+version: "10.0.999-SNAPSHOT"
 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 2a7415539..c8a53e406 100644
--- a/modules/kogito-data-index-ephemeral/community/module.yaml
+++ b/modules/kogito-data-index-ephemeral/community/module.yaml
@@ -18,7 +18,7 @@
 #
 schema_version: 1
 name: org.kie.kogito.dataindex.community.ephemeral
-version: "10.0.999-snapshot"
+version: "10.0.999-SNAPSHOT"
 
 # 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 beeb239ff..dcd5dbe3c 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -18,7 +18,7 @@
 #
 schema_version: 1
 name: org.kie.kogito.dataindex.postgresql
-version: "10.0.999-snapshot"
+version: "10.0.999-SNAPSHOT"
 
 # 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 ddf2d7ff2..9d99f72e9 100644
--- a/modules/kogito-dynamic-resources/module.yaml
+++ b/modules/kogito-dynamic-resources/module.yaml
@@ -18,7 +18,7 @@
 #
 schema_version: 1
 name: org.kie.kogito.dynamic.resources
-version: "10.0.999-snapshot"
+version: "10.0.999-SNAPSHOT"
 
 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-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 05374c23a..713b5de7a 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -18,7 +18,7 @@
 #
 schema_version: 1
 name: org.kie.kogito.jit-runner
-version: "10.0.999-snapshot"
+version: "10.0.999-SNAPSHOT"
 
 # 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 d541f099a..ba0ec6633 100644
--- a/modules/kogito-jobs-service-all-in-one/module.yaml
+++ b/modules/kogito-jobs-service-all-in-one/module.yaml
@@ -18,7 +18,7 @@
 #
 schema_version: 1
 name: org.kie.kogito.jobs.service.allinone
-version: "10.0.999-snapshot"
+version: "10.0.999-SNAPSHOT"
 
 artifacts:
   - path: /tmp/build/jobs-service-inmemory-all-in-one
diff --git a/modules/kogito-jobs-service-common/module.yaml b/modules/kogito-jobs-service-common/module.yaml
index d490a46ca..fa8a06c48 100644
--- a/modules/kogito-jobs-service-common/module.yaml
+++ b/modules/kogito-jobs-service-common/module.yaml
@@ -18,7 +18,7 @@
 #
 schema_version: 1
 name: org.kie.kogito.jobs.service.common
-version: "10.0.999-snapshot"
+version: "10.0.999-SNAPSHOT"
 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 9c1ae6683..c34346e4b 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -18,7 +18,7 @@
 #
 schema_version: 1
 name: org.kie.kogito.jobs.service.ephemeral
-version: "10.0.999-snapshot"
+version: "10.0.999-SNAPSHOT"
 
 # 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 e6028843d..1a30603e9 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -18,7 +18,7 @@
 #
 schema_version: 1
 name: org.kie.kogito.jobs.service.postgresql
-version: "10.0.999-snapshot"
+version: "10.0.999-SNAPSHOT"
 
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
diff --git a/modules/kogito-launch-scripts/module.yaml b/modules/kogito-launch-scripts/module.yaml
index 7d890574b..6b5b7a884 100644
--- a/modules/kogito-launch-scripts/module.yaml
+++ b/modules/kogito-launch-scripts/module.yaml
@@ -18,7 +18,7 @@
 #
 schema_version: 1
 name: org.kie.kogito.launch.scripts
-version: "10.0.999-snapshot"
+version: "10.0.999-SNAPSHOT"
 
 execute:
   - script: configure
diff --git a/modules/kogito-logging/module.yaml b/modules/kogito-logging/module.yaml
index 1df987bb0..3bd91bdf6 100644
--- a/modules/kogito-logging/module.yaml
+++ b/modules/kogito-logging/module.yaml
@@ -18,7 +18,7 @@
 #
 schema_version: 1
 name: org.kie.kogito.logging
-version: "10.0.999-snapshot"
+version: "10.0.999-SNAPSHOT"
 
 execute:
   - script: configure
diff --git a/modules/kogito-maven/common/module.yaml b/modules/kogito-maven/common/module.yaml
index ac4b18d8d..848ae4f6c 100644
--- a/modules/kogito-maven/common/module.yaml
+++ b/modules/kogito-maven/common/module.yaml
@@ -18,7 +18,7 @@
 #
 schema_version: 1
 name: org.kie.kogito.maven.common
-version: "10.0.999-snapshot"
+version: "10.0.999-SNAPSHOT"
 
 envs:
   - name: "MAVEN_VERSION"
diff --git a/modules/kogito-project-versions/module.yaml b/modules/kogito-project-versions/module.yaml
index 66d8df524..acc9f78a9 100644
--- a/modules/kogito-project-versions/module.yaml
+++ b/modules/kogito-project-versions/module.yaml
@@ -18,7 +18,7 @@
 #
 schema_version: 1
 name: org.kie.kogito.project.versions
-version: "10.0.999-snapshot"
+version: "10.0.999-SNAPSHOT"
 description: "Kogito Project versions information"
 
 envs:
diff --git a/modules/kogito-system-user/module.yaml b/modules/kogito-system-user/module.yaml
index 8d455d787..c167e523f 100644
--- a/modules/kogito-system-user/module.yaml
+++ b/modules/kogito-system-user/module.yaml
@@ -18,7 +18,7 @@
 #
 schema_version: 1
 name: org.kie.kogito.system.user
-version: "10.0.999-snapshot"
+version: "10.0.999-SNAPSHOT"
 
 execute:
   - script: add-user